rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部门管理-删除

This commit is contained in:
大米 2025-02-06 11:01:30 +08:00
parent 5d5800eb1b
commit d22fe7edec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java
View File

@ -28,7 +28,7 @@ public class AdminDepartmentService {
Page<TBaseDepartment> result = departmentService.selectListByPage(query); Page<TBaseDepartment> result = departmentService.selectListByPage(query);
List<BaseDepartmentVO> dataResult = Convert.toList(BaseDepartmentVO.class, result.getRecords()); List<BaseDepartmentVO> dataResult = Convert.toList(BaseDepartmentVO.class, result.getRecords());
if(StrUtil.isNotBlank(query.getDeptCodeOrName())){ if(StrUtil.isNotBlank(query.getDeptCodeOrName())){
List<BaseDepartmentVO> alldept = Convert.toList(BaseDepartmentVO.class,departmentService.list()) ; List<BaseDepartmentVO> alldept = Convert.toList(BaseDepartmentVO.class,departmentService.lambdaQuery().eq(TBaseDepartment::getDataValidStatus,1).list()) ;
Map<Integer, BaseDepartmentVO> collect = alldept.stream().collect(Collectors.toMap(BaseDepartmentVO::getId, Function.identity())); Map<Integer, BaseDepartmentVO> collect = alldept.stream().collect(Collectors.toMap(BaseDepartmentVO::getId, Function.identity()));
List<BaseDepartmentVO> allParents=new ArrayList<>(); List<BaseDepartmentVO> allParents=new ArrayList<>();
for (BaseDepartmentVO data:dataResult){ for (BaseDepartmentVO data:dataResult){
@ -60,7 +60,7 @@ public class AdminDepartmentService {
} }
private List<BaseDepartmentVO> findChildDepartmentsByParentId(int parentId) { private List<BaseDepartmentVO> findChildDepartmentsByParentId(int parentId) {
List<TBaseDepartment> depts = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptParentId, parentId).list(); List<TBaseDepartment> depts = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptParentId, parentId).eq(TBaseDepartment::getDataValidStatus,1).list();
return Convert.toList(BaseDepartmentVO.class,depts); return Convert.toList(BaseDepartmentVO.class,depts);
} }