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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 e6a0003..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,10 +44,15 @@
@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 鏌ヨ鐢ㄦ埛淇℃伅
@@ -66,7 +71,7 @@
* @return 灏忓尯瀵瑰簲鐨勬ゼ鎬昏褰曟暟
*/
@Override
- public int queryFloorsCount(@RequestParam("communityId") String communityId) {
+ public int queryFloorsCount(String communityId) {
return floorServiceDaoImpl.queryFloorsCount(communityId);
}
@@ -91,12 +96,12 @@
* @return 鎵归噺userIds 淇℃伅
*/
private String[] getUserIds(List<FloorDto> floors) {
- List<String> userIds = new ArrayList<>();
+ List<String> userIds = new ArrayList<String>();
for (FloorDto floor : floors) {
userIds.add(floor.getUserId());
}
- return (String[]) userIds.toArray();
+ return userIds.toArray(new String[userIds.size()]);
}
public IFloorServiceDao getFloorServiceDaoImpl() {
--
Gitblit v1.8.0