diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java
index 742f3a22..8e3c8071 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DeptServiceImpl.java
@@ -92,7 +92,11 @@ public class DeptServiceImpl implements DeptService {
                 }
             }
         }
-        List<DeptDto> list = deptMapper.toDto(deptRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), sort));
+        if (Boolean.FALSE.equals(criteria.getEnabled())){
+            criteria.setPidIsNull(null);
+        }
+        List<Dept> all = deptRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), sort);
+        List<DeptDto> list = deptMapper.toDto(all);
         // 如果为空，就代表为自定义权限或者本级权限，就需要去重，不理解可以注释掉，看查询结果
         if (StrUtil.isEmpty(dataScopeType)) {
             return deduplication(list);