冗余

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

@@ -429,18 +429,4 @@ public class SysDeptController {
         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

@@ -240,9 +240,4 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
      */
     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

@@ -326,5 +326,4 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     AllDeptDTO getAllDeptInfoByName(String gridName);
 
-    List<DeptInfoResultDTO> deptInfo(DeptInfoFormDTO formDTO);
 }

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

@@ -1181,30 +1181,4 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         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

@@ -401,17 +401,6 @@
 			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,