From 58905cfd66121136554c04d3f0a5ea1259d04f36 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 6 Jul 2020 11:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E5=90=8D=E4=B8=8B=E6=8B=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=20=E4=B8=9A=E5=8A=A1=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/controller/GroupController.java     |  5 +++--
 .../modules/smile/group/dao/GroupDao.java     |  4 ++--
 .../smile/group/service/GroupService.java     |  4 ++--
 .../group/service/impl/GroupServiceImpl.java  |  8 ++++++--
 .../resources/mapper/smile/group/GroupDao.xml | 20 ++++++++++++++-----
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
index 3b6398b..695b4a2 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/controller/GroupController.java
@@ -186,8 +186,9 @@ public class GroupController {
      * @since 2019/11/12 9:30
      */
     @GetMapping("groupList")
-    public Result<List<GroupListDTO>> groupList() {
-        List<GroupListDTO> data = groupService.listOfGroupByGridId(SecurityUser.getDeptId());
+    public Result<List<GroupListDTO>> groupList(GroupDTO dto) {
+        dto.setDeptId(SecurityUser.getDeptId());
+        List<GroupListDTO> data = groupService.listOfGroupByGridId(dto);
         return new Result<List<GroupListDTO>>().ok(data);
     }
 
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/dao/GroupDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/dao/GroupDao.java
index 68c361f..1e28416 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/dao/GroupDao.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/dao/GroupDao.java
@@ -137,11 +137,11 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      * 获取网格下所有社群
      *
      * @return java.util.List<com.elink.esua.epdc.smile.dto.group.GroupListDTO>
-     * @params [deptId]
+     * @params [dto]
      * @author liuchuang
      * @since 2019/11/12 9:35
      */
-    List<GroupListDTO> selectListOfGroupByGridId(Long deptId);
+    List<GroupListDTO> selectListOfGroupByGridId(GroupDTO dto);
 
     /**
      * 获取警群社区下所有社群
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/GroupService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/GroupService.java
index b535242..ee0987c 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/GroupService.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/group/service/GroupService.java
@@ -262,11 +262,11 @@ public interface GroupService extends BaseService<GroupEntity> {
      * 获取网格下所有社群
      *
      * @return java.util.List<com.elink.esua.epdc.smile.dto.group.GroupListDTO>
-     * @params [deptId]
+     * @params [dto]
      * @author liuchuang
      * @since 2019/11/12 9:33
      */
-    List<GroupListDTO> listOfGroupByGridId(Long deptId);
+    List<GroupListDTO> listOfGroupByGridId(GroupDTO dto);
 
     /**
      * 排行榜-活跃度
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 fa0f4dd..2cc7a70 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
@@ -425,8 +425,12 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     }
 
     @Override
-    public List<GroupListDTO> listOfGroupByGridId(Long deptId) {
-        return baseDao.selectListOfGroupByGridId(deptId);
+    public List<GroupListDTO> listOfGroupByGridId(GroupDTO dto) {
+        // 获取组织结构冗余信息
+        Result<DeptLevelAndLeaderDTO> parentAndAllDeptDTOResult = adminFeignClient.getDeptlevelById(dto.getDeptId());
+        DeptLevelAndLeaderDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
+        dto.setDeptList(parentAndAllDeptDTO.getAllDeptIds().split(","));
+        return baseDao.selectListOfGroupByGridId(dto);
     }
 
     @Override
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 c4e5bd8..eeaead4 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
@@ -307,11 +307,21 @@ ORDER BY
             epdc_group
         WHERE
             DEL_FLAG = '0'
-            AND SECTION_CODE = 'theme_group'
-            AND CATEGORY_CODE = 'police_group'
-            AND TYPE_KEY = 'community_party'
-            AND STATE IN ( 10, 15, 20 )
-            AND DEPT_ID = #{deptId}
+        AND STATE IN ( 10, 15, 20 )
+        <if test="sectionCode != null and sectionCode != ''">
+            AND SECTION_CODE = #{sectionCode}
+        </if>
+        <if test="categoryCode != null and categoryCode != ''">
+            AND CATEGORY_CODE = #{categoryCode}
+        </if>
+        <if test="typeKey != null and typeKey != ''">
+            AND TYPE_KEY = #{typeKey}
+        </if>
+        AND (find_in_set(#{deptId},ALL_DEPT_IDS)
+        OR DEPT_ID IN
+        <foreach item="dept" collection="deptList" open="(" separator="," close=")">
+            #{dept}
+        </foreach>)
     </select>
 
     <select id="selectListOfGroupByDeptId" resultType="com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO">