diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 5177b470d..532511b2c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 部门管理 @@ -46,6 +47,15 @@ public class SysDeptController { return new Result>().ok(list); } + @GetMapping("sublist/{pid}") + @ApiOperation("子列表") + public Result> sublist(@PathVariable("pid") String pid){ + Map map = new HashMap(); + map.put("pid",pid); + List list = sysDeptService.subList(map); + return new Result>().ok(list); + } + @GetMapping("{id}") @ApiOperation("信息") public Result get(@PathVariable("id") Long id){ diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index f9c59b570..c16eb1e83 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -39,4 +39,6 @@ public interface SysDeptDao extends BaseDao { * @param id 部门ID */ List getSubDeptIdList(String id); + + List getSubList(Map params); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 35d94e97b..e992eda68 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -34,6 +34,9 @@ public interface SysDeptService extends BaseService { void delete(Long id); + //根据pid获取下一级子列表 + List subList(Map params); + /** * 根据部门ID,获取本部门及子部门ID列表 * @param id 部门ID diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index e560aceb3..6a016bea2 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -59,6 +59,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl subList(Map params) { + //查询部门列表 + List entityList = baseDao.getSubList(params); + List dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class); + return TreeUtils.build(dtoList); + } + @Override public SysDeptDTO get(Long id) { //超级管理员,部门ID为null diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 83b2a5ba4..336e39112 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -15,6 +15,10 @@ order by t1.sort asc + +