From 2fc5bcc5375e345113807b245b07863585803a6c Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 30 May 2022 18:01:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=AE=A1=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/SysDeptController.java | 15 ++++++ .../com/elink/esua/epdc/dao/SysDeptDao.java | 6 +++ .../esua/epdc/service/SysDeptService.java | 4 ++ .../epdc/service/impl/SysDeptServiceImpl.java | 28 +++++++++++ .../src/main/resources/mapper/SysDeptDao.xml | 46 +++++++++++++++++++ 5 files changed, 99 insertions(+) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 431f481..8c25d98 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -24,6 +24,8 @@ import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; +import com.elink.esua.epdc.dto.form.DeptInfoFormDTO; +import com.elink.esua.epdc.dto.result.DeptInfoResultDTO; import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService; import com.elink.esua.epdc.service.SysDeptService; import io.swagger.annotations.Api; @@ -413,5 +415,18 @@ public class SysDeptController { return new Result().ok(data); } + /** + * @param formDTO + * @Author: wgf + * @Note: 根据标签或者父id查询部门列表信息 + * @Date: 13:42 2022/05/30 + * @Modified by: + */ + @GetMapping("deptInfo") + public Result> deptInfo(DeptInfoFormDTO formDTO) { + List list = sysDeptService.deptInfo(formDTO); + return new Result>().ok(list); + } + } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index 2008588..ff5d747 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -15,6 +15,8 @@ import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; +import com.elink.esua.epdc.dto.form.DeptInfoFormDTO; +import com.elink.esua.epdc.dto.result.DeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -234,5 +236,9 @@ public interface SysDeptDao extends BaseDao { */ AllDeptDTO getDeptInfoByName(@Param("gridName") String gridName); + SysDeptEntity selectDeptPidByDeptId(@Param("agencyId") Long agencyId); + + List deptInfo(DeptInfoFormDTO formDTO); + } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 4a24f94..3cc6c2b 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -18,6 +18,8 @@ import com.elink.esua.epdc.dto.epdc.form.DeptIdByPidFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptAreaCodeFormDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; +import com.elink.esua.epdc.dto.form.DeptInfoFormDTO; +import com.elink.esua.epdc.dto.result.DeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptEntity; import java.util.List; @@ -321,4 +323,6 @@ public interface SysDeptService extends BaseService { * @date 2021/11/22 14:53 */ AllDeptDTO getAllDeptInfoByName(String gridName); + + List deptInfo(DeptInfoFormDTO formDTO); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index f19283f..0ea311c 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -44,6 +44,8 @@ import com.elink.esua.epdc.dto.epdc.result.AreaCodeChildResultDTO; import com.elink.esua.epdc.dto.epdc.result.AreaCodeParentResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptAreaCodeResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; +import com.elink.esua.epdc.dto.form.DeptInfoFormDTO; +import com.elink.esua.epdc.dto.result.DeptInfoResultDTO; import com.elink.esua.epdc.entity.AdminImgEntity; import com.elink.esua.epdc.entity.SysDeptEntity; import com.elink.esua.epdc.entity.SysDeptInfoEntity; @@ -1152,4 +1154,30 @@ public class SysDeptServiceImpl extends BaseServiceImpl deptInfo(DeptInfoFormDTO formDTO) { + long countryId = 370124L; + if (SecurityUser.getUser().getSuperAdmin() != NumConstant.ONE && countryId != SecurityUser.getUser().getDeptId()) { + List 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); + } + } diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml index f06c0c9..71eb16f 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml @@ -400,4 +400,50 @@ grid.tags LIKE '%grid_party%' AND grid.name = #{gridName} + + + +