【组织架构/模糊搜索】：没有挂靠通道/小组的人要展示出来；屹动班组的苏晓丹属于该班组，不属于任何一个小组，但是这个人也要在组织架构里体现出来；

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -505,6 +505,7 @@ public class SysUserController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/deptUserTree")
+    @Cacheable(value = "dept_user_tree", key = "#dept.deptId ?: 'all'")
     public AjaxResult deptUserTree(SysDept dept) {
         return success(deptService.selectDeptUserTreeList(dept));
     }
@@ -924,4 +925,4 @@ public class SysUserController extends BaseController {
 
         return result;
     }
-}
+}

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysDeptServiceImpl.java

@@ -2,8 +2,10 @@ package com.sundot.airport.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
@@ -227,7 +229,6 @@ public class SysDeptServiceImpl implements ISysDeptService {
      */
     private DeptUserTreeSelect convertDeptToDeptUserTreeSelect(SysDept dept) {
         DeptUserTreeSelect treeSelect = new DeptUserTreeSelect(dept);
-
         List<DeptUserTreeSelect> children = new ArrayList<>();
 
         // 处理子部门
@@ -237,15 +238,20 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     .collect(Collectors.toList()));
         }
 
-        // 如果是班组类型，则添加用户节点
-        if (DeptTypeEnum.TEAMS.getCode().equals(dept.getDeptType())) {
-            List<SysUser> users = userMapper.selectUsersByDeptId(dept.getDeptId());
-            if (users != null && !users.isEmpty()) {
-                List<DeptUserTreeSelect> userChildren = users.stream()
-                        .map(DeptUserTreeSelect::new)
-                        .collect(Collectors.toList());
-                children.addAll(userChildren);
-            }
+        // 根据部门类型添加用户节点
+        String deptType = dept.getDeptType();
+        
+        if (DeptTypeEnum.TEAMS.getCode().equals(deptType)) {
+            // 小组类型：直接添加该小组下的所有用户
+            addUsersToChildren(dept.getDeptId(), children);
+            
+        } else if (DeptTypeEnum.MANAGER.getCode().equals(deptType)) {
+            // 班组类型：添加未分配到任何小组的用户
+            addOrphanUsersToChildren(dept, children);
+            
+        } else if (DeptTypeEnum.BRIGADE.getCode().equals(deptType)) {
+            // 部门类型：添加未挂靠到任何班组、小组的用户
+            addBrigadeOrphanUsersToChildren(dept, children);
         }
 
         if (!children.isEmpty()) {
@@ -256,6 +262,132 @@ public class SysDeptServiceImpl implements ISysDeptService {
     }
 
     /**
+     * 添加指定部门下的所有用户到子节点列表
+     *
+     * @param deptId   部门ID
+     * @param children 子节点列表
+     */
+    private void addUsersToChildren(Long deptId, List<DeptUserTreeSelect> children) {
+        List<SysUser> users = userMapper.selectUsersByDeptId(deptId);
+        if (users != null && !users.isEmpty()) {
+            users.stream()
+                    .map(DeptUserTreeSelect::new)
+                    .forEach(children::add);
+        }
+    }
+
+    /**
+     * 添加班组下未分配到任何小组的用户
+     *
+     * @param managerDept 班组部门
+     * @param children    子节点列表
+     */
+    private void addOrphanUsersToChildren(SysDept managerDept, List<DeptUserTreeSelect> children) {
+        List<SysUser> allUsers = userMapper.selectUsersByDeptId(managerDept.getDeptId());
+        if (allUsers == null || allUsers.isEmpty()) {
+            return;
+        }
+
+        // 获取该班组下所有小组的用户ID集合
+        java.util.Set<Long> usersInGroups = getUsersInChildGroups(managerDept.getChildren());
+
+        // 添加未分配到任何小组的用户
+        allUsers.stream()
+                .filter(user -> !usersInGroups.contains(user.getUserId()))
+                .map(DeptUserTreeSelect::new)
+                .forEach(children::add);
+    }
+
+    /**
+     * 添加部门下未挂靠到任何班组、小组的用户
+     *
+     * @param brigadeDept 部门
+     * @param children    子节点列表
+     */
+    private void addBrigadeOrphanUsersToChildren(SysDept brigadeDept, List<DeptUserTreeSelect> children) {
+        List<SysUser> allUsers = userMapper.selectUsersByDeptId(brigadeDept.getDeptId());
+        if (allUsers == null || allUsers.isEmpty()) {
+            return;
+        }
+
+        // 获取该部门下所有班组和小组的用户ID集合
+        java.util.Set<Long> usersInSubDepts = getUsersInChildDepts(brigadeDept.getChildren());
+
+        // 添加未挂靠到任何班组、小组的用户
+        allUsers.stream()
+                .filter(user -> !usersInSubDepts.contains(user.getUserId()))
+                .map(DeptUserTreeSelect::new)
+                .forEach(children::add);
+    }
+
+    /**
+     * 获取子部门中所有小组的用户ID集合
+     *
+     * @param childDepts 子部门列表
+     * @return 用户ID集合
+     */
+    private java.util.Set<Long> getUsersInChildGroups(List<SysDept> childDepts) {
+        java.util.Set<Long> userIds = new java.util.HashSet<>();
+        if (childDepts == null || childDepts.isEmpty()) {
+            return userIds;
+        }
+
+        // 只筛选小组类型的子部门
+        childDepts.stream()
+                .filter(child -> DeptTypeEnum.TEAMS.getCode().equals(child.getDeptType()))
+                .forEach(group -> {
+                    List<SysUser> groupUsers = userMapper.selectUsersByDeptId(group.getDeptId());
+                    if (groupUsers != null) {
+                        groupUsers.forEach(user -> userIds.add(user.getUserId()));
+                    }
+                });
+
+        return userIds;
+    }
+
+    /**
+     * 获取子部门中所有班组和小组的用户ID集合
+     *
+     * @param childDepts 子部门列表
+     * @return 用户ID集合
+     */
+    private java.util.Set<Long> getUsersInChildDepts(List<SysDept> childDepts) {
+        java.util.Set<Long> userIds = new java.util.HashSet<>();
+        if (childDepts == null || childDepts.isEmpty()) {
+            return userIds;
+        }
+
+        // 递归获取所有子部门的用户
+        collectUsersFromDepts(childDepts, userIds);
+        return userIds;
+    }
+
+    /**
+     * 递归收集部门树中的所有用户ID
+     *
+     * @param depts   部门列表
+     * @param userIds 用户ID集合（累加结果）
+     */
+    private void collectUsersFromDepts(List<SysDept> depts, java.util.Set<Long> userIds) {
+        if (depts == null || depts.isEmpty()) {
+            return;
+        }
+
+        for (SysDept dept : depts) {
+            // 添加当前部门的用户
+            List<SysUser> deptUsers = userMapper.selectUsersByDeptId(dept.getDeptId());
+            if (deptUsers != null) {
+                deptUsers.forEach(user -> userIds.add(user.getUserId()));
+            }
+
+            // 递归处理子部门
+            if (dept.getChildren() != null && !dept.getChildren().isEmpty()) {
+                collectUsersFromDepts(dept.getChildren(), userIds);
+            }
+        }
+    }
+
+    /**
      * 根据角色ID查询部门树信息
      *
      * @param roleId 角色ID