Commit dc1c474770316558de2c98f48674c9d002c7e7b8
1 parent
68c7f886
更换获取部门信息接口
Showing
3 changed files
with
15 additions
and
2 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptService.java
| @@ -152,4 +152,10 @@ public interface DeptService { | @@ -152,4 +152,10 @@ public interface DeptService { | ||
| 152 | * @return 部门树 | 152 | * @return 部门树 |
| 153 | */ | 153 | */ |
| 154 | List<Dept> getDeptAndUserTree(); | 154 | List<Dept> getDeptAndUserTree(); |
| 155 | + | ||
| 156 | + /** | ||
| 157 | + * 查询所有部门信息 | ||
| 158 | + * @return | ||
| 159 | + */ | ||
| 160 | + List<DeptDO> getDeptAllList(); | ||
| 155 | } | 161 | } |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java
| @@ -329,4 +329,11 @@ public class DeptServiceImpl implements DeptService { | @@ -329,4 +329,11 @@ public class DeptServiceImpl implements DeptService { | ||
| 329 | } | 329 | } |
| 330 | return TreeUtils.getTreeList(deptListT); | 330 | return TreeUtils.getTreeList(deptListT); |
| 331 | } | 331 | } |
| 332 | + | ||
| 333 | + @Override | ||
| 334 | + public List<DeptDO> getDeptAllList() { | ||
| 335 | + QueryWrapper<DeptDO> sql = new QueryWrapper<>(); | ||
| 336 | + sql.lambda().eq(DeptDO::getDeleted, 0); | ||
| 337 | + return deptMapper.selectList(sql); | ||
| 338 | + } | ||
| 332 | } | 339 | } |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/user/AdminUserServiceImpl.java
| @@ -680,8 +680,8 @@ public class AdminUserServiceImpl implements AdminUserService { | @@ -680,8 +680,8 @@ public class AdminUserServiceImpl implements AdminUserService { | ||
| 680 | if(dept.getParentId().equals(100L)) { | 680 | if(dept.getParentId().equals(100L)) { |
| 681 | return dept.getId(); | 681 | return dept.getId(); |
| 682 | } | 682 | } |
| 683 | - //一级以下查二级 | ||
| 684 | - List<DeptDO> allDeptList = deptService.getSubDeptAllList(); | 683 | + //所有 |
| 684 | + List<DeptDO> allDeptList = deptService.getDeptAllList(); | ||
| 685 | if (CollectionUtil.isEmpty(allDeptList)) { | 685 | if (CollectionUtil.isEmpty(allDeptList)) { |
| 686 | return null; | 686 | return null; |
| 687 | } | 687 | } |