From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserService/src/main/java/com/java110/user/smo/impl/OrgInnerServiceSMOImpl.java |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 1 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 3dacb3f..ffc8586 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,15 @@
 
 
 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.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.RestController;
@@ -33,6 +35,10 @@
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
+
+
     @Override
     public List<OrgDto> queryOrgs(@RequestBody OrgDto orgDto) {
 
@@ -46,6 +52,21 @@
 
         List<OrgDto> orgs = BeanConvertUtil.covertBeanList(orgServiceDaoImpl.getOrgInfo(BeanConvertUtil.beanCovertMap(orgDto)), OrgDto.class);
 
+        String[] communityIds = getCommunityIds(orgs);
+        if (communityIds == null || communityIds.length < 1) {
+            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;
     }
@@ -54,6 +75,50 @@
     @Override
     public int queryOrgsCount(@RequestBody OrgDto orgDto) {
         return orgServiceDaoImpl.queryOrgsCount(BeanConvertUtil.beanCovertMap(orgDto));
+    }
+
+
+    /**
+     * <p>鏌ヨ涓婄骇缁勭粐淇℃伅</p>
+     *
+     * @param orgDto 鏁版嵁瀵硅薄鍒嗕韩
+     * @return OrgDto 瀵硅薄鏁版嵁
+     */
+    @Override
+    public List<OrgDto> queryParentOrgs(@RequestBody OrgDto orgDto) {
+
+        //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+        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() {
@@ -71,4 +136,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