diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java index a0c8720a..69bba807 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java @@ -45,7 +45,13 @@ public class SysDeptController extends AbstractController { * 列表 */ @RequestMapping("/list") - public ResponseEntity list(@RequestBody long deptId) { + public ResponseEntity list(@RequestBody Map pramsMap) { + long deptId = 0; + if(StringUtils.isNotEmpty(pramsMap.get("deptId"))) { + deptId = Long.parseLong(pramsMap.get("deptId")); + }else{ + deptId = -1; + } String company = ""; UserInfo userInfo = getUserInfo(); if (Long.parseLong(getUserId()) != Constant.SUPER_ADMIN && !userInfo.getCompany().contains(SysConfig.ZXQY)) { diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java index afe54c19..3dd677ca 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java @@ -58,6 +58,17 @@ public class SysDeptServiceImpl extends ServiceImpl i public List queryList(String company, long parentId) { DynamicContextHolder.push(DbConstant.BASICS_READ); List deptList = baseMapper.queryList(company); + if(parentId == -1){ + parentId = 0; + if (StringUtils.isNotBlank(company)) { + for (SysDeptEntity deptEntity : deptList) { + if ("1".equals(deptEntity.getDeptType())) { + parentId = deptEntity.getParentId(); + break; + } + } + } + } return this.getChildPerms(deptList, parentId); }