From 2633f776bb8fdb0b1efe3a56293b6a1bb04616a7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 28 四月 2019 10:48:14 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java b/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
index cf788e0..2d08a75 100644
--- a/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
+++ b/CommunityService/src/main/java/com/java110/community/smo/impl/FloorInnerServiceSMOImpl.java
@@ -44,11 +44,16 @@
@Override
public List<FloorDto> queryFloors(@RequestParam("page") int page, @RequestParam("row") int row, @RequestParam("communityId") String communityId) {
Map<String, Object> floorInfo = new HashMap<String, Object>();
- floorInfo.put("page", page);
- floorInfo.put("row", row);
+ floorInfo.put("page", (page-1)*row);
+ floorInfo.put("row", row*page);
floorInfo.put("communityId", communityId);
List<FloorDto> floors = BeanConvertUtil.covertBeanList(floorServiceDaoImpl.queryFloors(floorInfo), FloorDto.class);
+
+ if(floors == null || floors.size() == 0){
+ return floors;
+ }
+
String[] userIds = getUserIds(floors);
//鏍规嵁 userId 鏌ヨ鐢ㄦ埛淇℃伅
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
--
Gitblit v1.8.0