From 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 10 二月 2020 14:35:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java b/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
index 915321f..8bfec57 100644
--- a/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
+++ b/UserService/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java
@@ -1,7 +1,6 @@
package com.java110.user.smo.impl;
-import com.java110.utils.constant.CommunityMemberTypeConstant;
import com.java110.utils.constant.OwnerTypeConstant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
@@ -10,17 +9,15 @@
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.CommunityMemberDto;
-import com.java110.dto.OwnerDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.PageDto;
-import com.java110.dto.UserDto;
+import com.java110.dto.user.UserDto;
import com.java110.user.dao.IOwnerServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,6 +57,12 @@
if (communityMemberDtos == null || communityMemberDtos.size() < 1) {
return null;
}*/
+
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
+ }
Map ownerInfo = BeanConvertUtil.beanCovertMap(ownerDto);
ownerInfo.put("communityId",ownerDto.getCommunityId());
@@ -154,6 +157,11 @@
communityMemberDto.setCommunityId(ownerDto.getCommunityId());
communityMemberDto.setMemberTypeCd(CommunityMemberTypeConstant.OWNER);
return communityInnerServiceSMOImpl.getCommunityMemberCount(communityMemberDto);*/
+ int page = ownerDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ ownerDto.setPage((page - 1) * ownerDto.getRow());
+ }
Map ownerInfo = BeanConvertUtil.beanCovertMap(ownerDto);
ownerInfo.put("communityId",ownerDto.getCommunityId());
--
Gitblit v1.8.0