From ef431a71ed043e8fb63777793df23c110b853803 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 09:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 93fad37..d68aa2e 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -113,7 +113,7 @@
ValidateUtil.notNull(uid, "param.is.null");
Device device = new Device();
device.setOperateUserId(uid);
- PageHelper.startPage(pageIndex, pageSize);
+ PageHelper.startPage(pageIndex, pageSize,false);
List<Device> devices = deviceMapper.select(device);
return devices;
}
@@ -405,4 +405,10 @@
}).collect(Collectors.toList());
return list;
}
+
+ @Override
+ public Device queryById(Integer id) {
+ return deviceMapper.selectByPrimaryKey(id);
+ }
+
}
--
Gitblit v1.8.0