群名下拉菜单 业务改造

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() {
+    public Result<List<GroupListDTO>> groupList(GroupDTO dto) {
-        List<GroupListDTO> data = groupService.listOfGroupByGridId(SecurityUser.getDeptId());
+        dto.setDeptId(SecurityUser.getDeptId());
+        List<GroupListDTO> data = groupService.listOfGroupByGridId(dto);
         return new Result<List<GroupListDTO>>().ok(data);
     }
 

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);
 
     /**
      * 获取警群社区下所有社群

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);
 
     /**
      * 排行榜-活跃度

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) {
+    public List<GroupListDTO> listOfGroupByGridId(GroupDTO dto) {
-        return baseDao.selectListOfGroupByGridId(deptId);
+        // 获取组织结构冗余信息
+        Result<DeptLevelAndLeaderDTO> parentAndAllDeptDTOResult = adminFeignClient.getDeptlevelById(dto.getDeptId());
+        DeptLevelAndLeaderDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
+        dto.setDeptList(parentAndAllDeptDTO.getAllDeptIds().split(","));
+        return baseDao.selectListOfGroupByGridId(dto);
     }
 
     @Override

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}
+        <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">