From e1b7531400b7c8c43b6cb346df7ac2120a97e73a Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 23 Aug 2017 10:40:35 +0800 Subject: [PATCH] =?UTF-8?q?id=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/service/impl/BaseServiceImpl.java | 7 +++++++ .../operate/web/service/impl/PlantformConfigServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BaseServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BaseServiceImpl.java index f3d0c20..ca3823d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BaseServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BaseServiceImpl.java @@ -37,6 +37,13 @@ public class BaseServiceImpl implements IBaseService { @Override public PageResult findMongoPage(Class entity, Query query, Integer page, Integer limit) { + if(page == null) { + page = 1; + } + if(limit == null) { + limit = 15; + } + Long count = mongoTemplate.count(query, entity); query.skip((page - 1) * limit); query.limit(limit); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java index 3a865a0..f5f1b4a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java @@ -50,7 +50,7 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant List> restList = new ArrayList<>(); for (PlantformConfigModel configModel : configModels) { Map tempMap = new HashMap<>(); - tempMap.put("id", configModel.getId()); + tempMap.put("id", configModel.getId().toString()); tempMap.put("name", configModel.getValue()); tempMap.put("date", DateUtil.getyyyy_MM_dd_hms(configModel.getCreateDate())); restList.add(tempMap); -- 1.8.3.1