From 2f6d8346c2a5c36c05fb18e43551bb2d5883c33a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 22 十二月 2019 02:32:13 +0800
Subject: [PATCH] 查询小区时取消 分页判断
---
UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java b/UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java
index 87e4131..f27864b 100644
--- a/UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java
+++ b/UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java
@@ -2,13 +2,17 @@
import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.community.ICommunityInnerServiceSMO;
import com.java110.core.smo.org.IOrgInnerServiceSMO;
import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.dto.OwnerDto;
import com.java110.dto.PageDto;
import com.java110.dto.UserDto;
+import com.java110.dto.community.CommunityDto;
import com.java110.dto.org.OrgDto;
import com.java110.user.dao.IOrgServiceDao;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,6 +39,10 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+
@Override
public List<OrgDto> queryOrgs(@RequestBody OrgDto orgDto) {
@@ -48,6 +56,21 @@
List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);
+ String[] communityIds = getCommunityIds(orgs);
+ if (communityIds == null || communityIds.length < 0) {
+ return orgs;
+ }
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityIds(communityIds);
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+
+ for (CommunityDto tmpCommunityDto : communityDtos) {
+ for (OrgDto tmpOrgDto : orgs) {
+ if (tmpCommunityDto.getCommunityId().equals(tmpOrgDto.getBelongCommunityId())) {
+ tmpOrgDto.setBelongCommunityName(tmpCommunityDto.getName());
+ }
+ }
+ }
return orgs;
}
@@ -62,7 +85,6 @@
/**
* <p>鏌ヨ涓婄骇缁勭粐淇℃伅</p>
*
- *
* @param orgDto 鏁版嵁瀵硅薄鍒嗕韩
* @return OrgDto 瀵硅薄鏁版嵁
*/
@@ -71,10 +93,36 @@
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
- List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);
+ List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getParentOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);
+ if (orgs == null) {
+ orgs = new ArrayList<>();
+ }
return orgs;
+ }
+
+
+ /**
+ * 鑾峰彇鎵归噺userId
+ *
+ * @param orgDtos 灏忓尯妤间俊鎭�
+ * @return 鎵归噺userIds 淇℃伅
+ */
+ private String[] getCommunityIds(List<OrgDto> orgDtos) {
+ List<String> communityIds = new ArrayList<String>();
+ for (OrgDto orgDto : orgDtos) {
+ if ("9999".equals(orgDto.getBelongCommunityId())) {
+ orgDto.setBelongCommunityName("鍏ラ┗鎵�鏈夊皬鍖�");
+ continue;
+ }
+ if (StringUtil.isEmpty(orgDto.getBelongCommunityId())) {
+ orgDto.setBelongCommunityName("鏈煡灏忓尯");
+ continue;
+ }
+ communityIds.add(orgDto.getBelongCommunityId());
+ }
+ return communityIds.toArray(new String[communityIds.size()]);
}
public IOrgServiceDao getOrgServiceDaoImpl() {
@@ -92,4 +140,12 @@
public void setUserInnerServiceSMOImpl(IUserInnerServiceSMO userInnerServiceSMOImpl) {
this.userInnerServiceSMOImpl = userInnerServiceSMOImpl;
}
+
+ public ICommunityInnerServiceSMO getCommunityInnerServiceSMOImpl() {
+ return communityInnerServiceSMOImpl;
+ }
+
+ public void setCommunityInnerServiceSMOImpl(ICommunityInnerServiceSMO communityInnerServiceSMOImpl) {
+ this.communityInnerServiceSMOImpl = communityInnerServiceSMOImpl;
+ }
}
--
Gitblit v1.8.0