Merge branch 'feature/codemove'

# Conflicts:
#	epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -403,4 +403,44 @@ public class SysDeptController {
         return new Result<List<SysDeptDTO>>().ok(data);
     }
 
+    /**
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @describe: 根据网格名称获取部门信息
+     * @author wgf
+     * @date 2022/4/25 21:54
+     * @params [gridName]
+     */
+    @GetMapping("getAllDeptInfoByGridName/{gridName}")
+    public Result<AllDeptDTO> getAllDeptInfoByGridName(@PathVariable String gridName) {
+        AllDeptDTO data = sysDeptService.getAllDeptInfoByGridName(gridName);
+        return new Result<AllDeptDTO>().ok(data);
+    }
+
+    /**
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @describe: 根据网格gridName获取所有相关部门
+     * @author wgf
+     * @date 2022/4/25 21:54
+     * @params [gridName]
+     */
+    @GetMapping("getAllDeptInfoByName/{gridName}")
+    public Result<AllDeptDTO> getAllDeptInfoByName(@PathVariable String gridName) {
+        AllDeptDTO data = sysDeptService.getAllDeptInfoByName(gridName);
+        return new Result<AllDeptDTO>().ok(data);
+    }
+
+    /**
+     * @param formDTO
+     * @Author: wgf
+     * @Note: 根据标签或者父id查询部门列表信息
+     * @Date: 13:42 2022/05/30
+     * @Modified by:
+     */
+    @GetMapping("deptInfo")
+    public Result<List<DeptInfoResultDTO>> deptInfo(DeptInfoFormDTO formDTO) {
+        List<DeptInfoResultDTO> list = sysDeptService.deptInfo(formDTO);
+        return new Result<List<DeptInfoResultDTO>>().ok(list);
+    }
+
+
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -227,4 +227,22 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     List<SysDeptDTO> getDeptInfoByPid(DeptIdByPidFormDTO dto);
+
+    AllDeptDTO getAllDeptInfoByGridName(@Param("gridName") String gridName);
+
+    /**
+     * 根据网格gridName获取所有相关部门
+     *
+     * @param gridName
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @author wgf
+     * @date 2021/11/22 14:53
+     */
+    AllDeptDTO getDeptInfoByName(@Param("gridName") String gridName);
+
+    SysDeptEntity selectDeptPidByDeptId(@Param("agencyId") Long agencyId);
+
+    List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO);
+
+
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -306,4 +306,25 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     List<SysDeptDTO> getDeptInfoByPid(DeptIdByPidFormDTO dto);
+
+    /**
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @describe: 根据网格名称获取部门信息
+     * @author wgf
+     * @date 2022/4/25 21:54
+     * @params [gridName]
+     */
+    AllDeptDTO getAllDeptInfoByGridName(String gridName);
+
+    /**
+     * 根据网格gridName获取所有相关部门
+     *
+     * @param gridName
+     * @return io.pingyin.modules.sys.dto.AllDeptDTO
+     * @author wgf
+     * @date 2021/11/22 14:53
+     */
+    AllDeptDTO getAllDeptInfoByName(String gridName);
+
+    List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -1170,4 +1170,41 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     public List<SysDeptDTO> getDeptInfoByPid(DeptIdByPidFormDTO dto) {
         return baseDao.getDeptInfoByPid(dto);
     }
+
+    @Override
+    public AllDeptDTO getAllDeptInfoByGridName(String gridName) {
+        return baseDao.getAllDeptInfoByGridName(gridName);
+    }
+
+    @Override
+    public AllDeptDTO getAllDeptInfoByName(String gridName) {
+        return baseDao.getDeptInfoByName(gridName);
+    }
+
+    @Override
+    public List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO) {
+        long countryId = 370124L;
+        if (SecurityUser.getUser().getSuperAdmin() != NumConstant.ONE && countryId != SecurityUser.getUser().getDeptId()) {
+            List<Long> deptIdList = SecurityUser.getUser().getDeptIdList();
+            if (SecurityUser.getUser().getDeptId() != null) {
+                SysDeptEntity deptEntity = baseDao.selectDeptPidByDeptId(SecurityUser.getUser().getDeptId());
+                // 如果这是网格员，就将社区ID放进权限（更高级部门也是）
+                if (deptEntity != null) {
+                    deptIdList.add(deptEntity.getId());
+                    SysDeptEntity pDeptEntity = baseDao.selectDeptPidByDeptId(deptEntity.getId());
+                    // 如果这是网格员，还要将街道ID放进权限（更高级部门也是）
+                    if (pDeptEntity != null) {
+                        deptIdList.add(pDeptEntity.getId());
+                    }
+                }
+                // 将所属部门的权限也放进来
+                SysDeptEntity entity = baseDao.getById(SecurityUser.getUser().getDeptId());
+                deptIdList.add(entity.getId());
+            }
+
+            formDTO.setDeptIdList(deptIdList);
+        }
+        return baseDao.deptInfo(formDTO);
+    }
+
 }

epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml

@@ -359,6 +359,59 @@
           AND t.pid = #{pid}
           order by t.id
     </select>
+
+    <select id="getAllDeptInfoByGridName" resultType="com.elink.esua.epdc.dto.AllDeptDTO">
+
+		SELECT
+			grid.id AS gridId,
+			grid.`name` AS gridName,
+			grid.id as gridDeptId,
+			comm.id AS communityId,
+			comm.`name` AS communityName,
+			comm.id as communityDeptId,
+			street.id AS streetId,
+			street.`name` AS streetName,
+			street.id as streetDeptId
+		FROM
+			sys_dept grid
+		LEFT JOIN sys_dept comm ON comm.id = grid.pid
+		LEFT JOIN sys_dept street ON street.id = comm.pid
+		WHERE
+			grid.type_key LIKE '%grid_party%'
+			AND grid.name = #{gridName}
+
+	</select>
+
+    <select id="getDeptInfoByName" resultType="com.elink.esua.epdc.dto.AllDeptDTO">
+		SELECT
+			grid.id AS gridId,
+			grid.`name` AS gridName,
+			comm.id AS communityId,
+			comm.`name` AS communityName,
+			street.id AS streetId,
+			street.`name` AS streetName,
+			street.id AS deptId,
+			street.`name` AS deptName
+		FROM
+			sys_dept grid
+		LEFT JOIN sys_dept comm ON comm.id = grid.pid
+		LEFT JOIN sys_dept street ON street.id = comm.pid
+		WHERE
+			grid.type_key LIKE '%grid_party%'
+			AND grid.name = #{gridName}
+	</select>
+
+    <select id="selectDeptPidByDeptId" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
+		SELECT
+			p.*
+		FROM
+			sys_dept d
+			LEFT JOIN sys_dept p ON p.id = d.pid
+		WHERE
+			d.id = #{agencyId}
+			AND p.pid != 0
+	</select>
+
     <select id="deptInfo" resultType="com.elink.esua.epdc.dto.result.DeptInfoResultDTO">
         SELECT
         d.id,
@@ -374,6 +427,7 @@
         sys_dept d
         LEFT JOIN sys_dept p ON d.pid = p.id
         <where>
+
             AND d.type_key in ('street_party','community_party','grid_party')
             <if test="tags!=null and tags!=''">
                 and d.type_key = #{tags}
@@ -405,4 +459,5 @@
 			AND p.pid != 0
 			AND d.type_key in ('street_party','community_party','grid_party')
 	</select>
+
 </mapper>