From c790caa4c0faf3c2889ed07eda2dd85f3036282f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 27 May 2022 15:18:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=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 | 27 ++++++++++++ .../com/elink/esua/epdc/dao/SysDeptDao.java | 14 +++++++ .../esua/epdc/service/SysDeptService.java | 19 +++++++++ .../epdc/service/impl/SysDeptServiceImpl.java | 11 +++++ .../src/main/resources/mapper/SysDeptDao.xml | 41 +++++++++++++++++++ 5 files changed, 112 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 b8dbb3a..431f481 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 @@ -387,4 +387,31 @@ public class SysDeptController { return new Result>().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 getAllDeptInfoByGridName(@PathVariable String gridName) { + AllDeptDTO data = sysDeptService.getAllDeptInfoByGridName(gridName); + return new Result().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 getAllDeptInfoByName(@PathVariable String gridName) { + AllDeptDTO data = sysDeptService.getAllDeptInfoByName(gridName); + return new Result().ok(data); + } + + } 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 3850bfe..2008588 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 @@ -221,4 +221,18 @@ public interface SysDeptDao extends BaseDao { * @return com.elink.esua.epdc.commons.tools.utils.Result */ List 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); + + } 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 21431bf..4a24f94 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 @@ -302,4 +302,23 @@ public interface SysDeptService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ List 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); } 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 06e36bc..f19283f 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 @@ -1141,4 +1141,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl 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); + } + } diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml index c23d9d0..f06c0c9 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml @@ -359,4 +359,45 @@ AND t.pid = #{pid} order by t.id + + + + 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 2/4] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=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} + + + + From 32f434763abdd33e283cbe2bb0dc54d652085b5a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 31 May 2022 11:20:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=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-cloud-admin/src/main/resources/mapper/SysDeptDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml index 71eb16f..3c58020 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml @@ -384,11 +384,11 @@ From f3745ae9caf2a034c49ee468a4c8c039973df979 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 31 May 2022 14:43:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BB=A3=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-cloud-admin/src/main/resources/mapper/SysDeptDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml index 3c58020..9349539 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptDao.xml @@ -365,19 +365,19 @@ SELECT grid.id AS gridId, grid.`name` AS gridName, - grid.dept_id as gridDeptId, + grid.id as gridDeptId, comm.id AS communityId, comm.`name` AS communityName, - comm.dept_id as communityDeptId, + comm.id as communityDeptId, street.id AS streetId, street.`name` AS streetName, - street.dept_id as streetDeptId + 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.tags LIKE '%grid_party%' + grid.type_key LIKE '%grid_party%' AND grid.name = #{gridName}