diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java index b0332ee6..66370006 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDepartmentService.java @@ -28,7 +28,7 @@ public class AdminDepartmentService { Page result = departmentService.selectListByPage(query); List dataResult = Convert.toList(BaseDepartmentVO.class, result.getRecords()); if(StrUtil.isNotBlank(query.getDeptCodeOrName())){ - List alldept = Convert.toList(BaseDepartmentVO.class,departmentService.list()) ; + List alldept = Convert.toList(BaseDepartmentVO.class,departmentService.lambdaQuery().eq(TBaseDepartment::getDataValidStatus,1).list()) ; Map collect = alldept.stream().collect(Collectors.toMap(BaseDepartmentVO::getId, Function.identity())); List allParents=new ArrayList<>(); for (BaseDepartmentVO data:dataResult){ @@ -60,7 +60,7 @@ public class AdminDepartmentService { } private List findChildDepartmentsByParentId(int parentId) { - List depts = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptParentId, parentId).list(); + List depts = departmentService.lambdaQuery().eq(TBaseDepartment::getDeptParentId, parentId).eq(TBaseDepartment::getDataValidStatus,1).list(); return Convert.toList(BaseDepartmentVO.class,depts); }