From d22fe7edec96c50b87dc49b5871f301be791f53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 6 Feb 2025 11:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobilebroken/admin/service/AdminDepartmentService.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<TBaseDepartment> result = departmentService.selectListByPage(query);
         List<BaseDepartmentVO> dataResult = Convert.toList(BaseDepartmentVO.class, result.getRecords());
         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()));
             List<BaseDepartmentVO> allParents=new ArrayList<>();
             for (BaseDepartmentVO data:dataResult){
@@ -60,7 +60,7 @@ public class AdminDepartmentService {
     }
 
     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);
 
     }