From 11a66bbdfef4188917a4bee05e083224d09ca094 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 6 Jul 2020 10:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=EF=BC=8C=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E6=95=99=E8=82=B2=EF=BC=8C=E5=85=B4=E8=B6=A3=E7=BE=A4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=20=20=20=20=20=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=AD=A3=20=20=20=20=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/service/impl/GroupServiceImpl.java  | 36 +++++++------------
 .../resources/mapper/smile/group/GroupDao.xml |  4 +++
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
index 6460b3c..fa0f4dd 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/impl/GroupServiceImpl.java
@@ -32,14 +32,6 @@ import com.elink.esua.epdc.constant.SysSmsTemplateConstant;
 import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
-import com.elink.esua.epdc.smile.dto.constant.GroupConstant;
-import com.elink.esua.epdc.smile.dto.constant.GroupNoticeConstant;
-import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum;
-import com.elink.esua.epdc.smile.dto.enums.GroupUserStateEnum;
-import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO;
-import com.elink.esua.epdc.smile.dto.group.*;
-import com.elink.esua.epdc.smile.dto.group.form.*;
-import com.elink.esua.epdc.smile.dto.group.result.*;
 import com.elink.esua.epdc.modules.smile.async.IssueOverseeResultsTask;
 import com.elink.esua.epdc.modules.smile.async.NewsTask;
 import com.elink.esua.epdc.modules.smile.feign.AdminFeignClient;
@@ -54,6 +46,14 @@ import com.elink.esua.epdc.modules.smile.group.service.UserGroupService;
 import com.elink.esua.epdc.modules.smile.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.smile.topic.service.GroupTopicUserReadService;
 import com.elink.esua.epdc.modules.smile.topic.service.TopicService;
+import com.elink.esua.epdc.smile.dto.constant.GroupConstant;
+import com.elink.esua.epdc.smile.dto.constant.GroupNoticeConstant;
+import com.elink.esua.epdc.smile.dto.enums.GroupStateEnum;
+import com.elink.esua.epdc.smile.dto.enums.GroupUserStateEnum;
+import com.elink.esua.epdc.smile.dto.events.form.GroupFormDTO;
+import com.elink.esua.epdc.smile.dto.group.*;
+import com.elink.esua.epdc.smile.dto.group.form.*;
+import com.elink.esua.epdc.smile.dto.group.result.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -694,20 +694,10 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
 
     @Override
     public List<GroupBySectionResultDTO> listBySection(GroupBySectionFormDTO dto) {
-        List<GroupBySectionResultDTO> dataList = baseDao.selectBySection(dto);
-        dataList.forEach(item -> {
-            UserGroupEntity entity = userGroupDao.selectGroupUserState(dto.getUserId(), item.getId());
-            if (entity != null && NumConstant.TEN == entity.getState()) {
-                // 已通过
-                item.setGroupMemberFlag(NumConstant.TWO_STR);
-            } else if (entity != null && NumConstant.ZERO == entity.getState()) {
-                // 待审核
-                item.setGroupMemberFlag(NumConstant.ONE_STR);
-            } else {
-                item.setGroupMemberFlag(NumConstant.ZERO_STR);
-            }
-        });
-
-        return dataList;
+        // 获取组织结构冗余信息
+        Result<DeptLevelAndLeaderDTO> parentAndAllDeptDTOResult = adminFeignClient.getDeptlevelById(dto.getGridId());
+        DeptLevelAndLeaderDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
+        dto.setDeptList(parentAndAllDeptDTO.getAllDeptIds().split(","));
+        return baseDao.selectBySection(dto);
     }
 }
diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml
index b5e68a8..c4e5bd8 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/group/GroupDao.xml
@@ -493,6 +493,10 @@ ORDER BY
         <if test="sectionCode != null and sectionCode != ''">
             AND gp.SECTION_CODE = #{sectionCode}
         </if>
+        AND gp.DEPT_ID IN
+        <foreach item="dept" collection="deptList" open="(" separator="," close=")">
+            #{dept}
+        </foreach>
     </select>
 
 </mapper>