获取部门及用户树列表新版

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

@@ -511,6 +511,20 @@ public class SysUserController extends BaseController {
     }
 
     /**
+     * 获取部门及用户树列表新版
+     */
+    @Cacheable(
+            value = "dept_and_user_tree",
+            keyGenerator = "statisticsKeyGenerator",
+            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
+    )
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/deptAndUserTree")
+    public AjaxResult deptAndUserTree(SysDept dept) {
+        return success(deptService.selectDeptAndUserTreeList(dept));
+    }
+
+    /**
      * 获取全部用户列表
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")

airport-common/src/main/java/com/sundot/airport/common/core/domain/DeptAndUserTreeSelect.java

@@ -0,0 +1,96 @@
+package com.sundot.airport.common.core.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.sundot.airport.common.constant.UserConstants;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.utils.StringUtils;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 部门用户树结构实体类新版
+ *
+ * @author ruoyi
+ */
+@Data
+public class DeptAndUserTreeSelect {
+
+    /**
+     * 节点类型（dept-部门 user-用户）
+     * */
+    private String nodeType;
+
+    /**
+     * 节点ID
+     */
+    private Long id;
+
+    /**
+     * 节点名称
+     */
+    private String label;
+
+    /**
+     * 节点code
+     */
+    private String code;
+
+    /**
+     * 节点禁用
+     */
+    private boolean disabled = false;
+
+    /**
+     * 上级
+     */
+    private Long parentId;
+
+    /**
+     * 部门类型
+     */
+    private String deptType;
+
+    /**
+     * 部门用户列表
+     */
+    private List<DeptAndUserTreeSelect> userList;
+
+    /**
+     * 子节点
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<DeptAndUserTreeSelect> children;
+
+    public DeptAndUserTreeSelect() {
+
+    }
+
+    /**
+     * 部门节点构造方法
+     *
+     * @param dept 部门信息
+     */
+    public DeptAndUserTreeSelect(SysDept dept) {
+        this.setId(dept.getDeptId());
+        this.setLabel(dept.getDeptName());
+        this.setParentId(dept.getParentId());
+        this.setDeptType(dept.getDeptType());
+        this.setNodeType("dept");
+        this.setDisabled(StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()));
+    }
+
+    /**
+     * 用户节点构造方法
+     *
+     * @param user 用户信息
+     */
+    public DeptAndUserTreeSelect(SysUser user) {
+        this.setId(user.getUserId());
+        this.setLabel(user.getNickName());
+        this.setParentId(user.getDeptId());
+        this.setNodeType("user");
+    }
+
+}

airport-system/src/main/java/com/sundot/airport/system/service/ISysDeptService.java

@@ -2,6 +2,7 @@ package com.sundot.airport.system.service;
 
 import java.util.List;
 
+import com.sundot.airport.common.core.domain.DeptAndUserTreeSelect;
 import com.sundot.airport.common.core.domain.TreeSelect;
 import com.sundot.airport.common.core.domain.DeptUserTreeSelect;
 import com.sundot.airport.common.core.domain.entity.SysDept;
@@ -40,6 +41,14 @@ public interface ISysDeptService {
     public List<DeptUserTreeSelect> selectDeptUserTreeList(SysDept dept);
 
     /**
+     * 查询部门及用户树结构信息新版
+     *
+     * @param dept 部门信息
+     * @return 部门及用户树信息集合
+     */
+    public List<DeptAndUserTreeSelect> selectDeptAndUserTreeList(SysDept dept);
+
+    /**
      * 根据角色ID查询部门树信息
      *
      * @param roleId 角色ID

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

@@ -13,6 +13,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.config.LevelConfig;
+import com.sundot.airport.common.core.domain.DeptAndUserTreeSelect;
 import com.sundot.airport.common.dto.DeptInfo;
 import com.sundot.airport.common.dto.UserOrgInfo;
 import com.sundot.airport.common.enums.DeptType;
@@ -759,4 +760,89 @@ public class SysDeptServiceImpl implements ISysDeptService {
         result.setDeptInfo(getDeptInfoByDeptId(user.getDeptId()));
         return result;
     }
+
+    /**
+     * 查询部门及用户树结构信息新版
+     *
+     * @param dept 部门信息
+     * @return 部门及用户树信息集合
+     */
+    @Override
+    public List<DeptAndUserTreeSelect> selectDeptAndUserTreeList(SysDept dept) {
+        List<SysDept> depts;
+        // 如果指定了部门ID，则查询该部门及其所有子部门
+        if (dept.getDeptId() != null && dept.getDeptId() != 0) {
+            SysDept targetDept = deptMapper.selectDeptById(dept.getDeptId());
+            if (targetDept != null) {
+                // 查询所有部门
+                SysDept queryDept = new SysDept();
+                List<SysDept> allDepts = SpringUtils.getAopProxy(this).selectDeptList(queryDept);
+                // 构建完整的部门树
+                List<SysDept> deptTree = buildCompleteDeptTree(allDepts);
+                // 查找目标部门及其所有子部门
+                SysDept foundDept = findDeptWithChildren(deptTree, dept.getDeptId());
+                if (foundDept != null) {
+                    List<SysDept> targetList = new ArrayList<>();
+                    targetList.add(foundDept);
+                    depts = targetList;
+                } else {
+                    // 如果没找到，返回只包含目标部门的列表
+                    List<SysDept> singleList = new ArrayList<>();
+                    singleList.add(targetDept);
+                    depts = singleList;
+                }
+            } else {
+                // 如果部门不存在，返回空列表
+                depts = new ArrayList<>();
+            }
+        } else {
+            // 如果没有指定部门ID，查询所有部门
+            depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        }
+        return buildDeptAndUserTreeSelect(depts);
+    }
+
+    /**
+     * 构建前端所需要下拉树结构（包含用户）新版
+     *
+     * @param depts 部门列表
+     * @return 下拉树结构列表（包含用户）
+     */
+    public List<DeptAndUserTreeSelect> buildDeptAndUserTreeSelect(List<SysDept> depts) {
+        List<SysDept> deptTrees = buildCompleteDeptTree(depts);
+        return deptTrees.stream().map(this::convertDeptToDeptAndUserTreeSelect).collect(Collectors.toList());
+    }
+
+    /**
+     * 将部门转换为包含用户的树节点新版
+     *
+     * @param dept 部门信息
+     * @return 树节点
+     */
+    private DeptAndUserTreeSelect convertDeptToDeptAndUserTreeSelect(SysDept dept) {
+        DeptAndUserTreeSelect treeSelect = new DeptAndUserTreeSelect(dept);
+
+        List<DeptAndUserTreeSelect> children = new ArrayList<>();
+
+        // 处理子部门
+        if (dept.getChildren() != null && !dept.getChildren().isEmpty()) {
+            children.addAll(dept.getChildren().stream()
+                    .map(this::convertDeptToDeptAndUserTreeSelect)
+                    .collect(Collectors.toList()));
+        }
+
+        List<SysUser> users = userMapper.selectUsersByDeptId(dept.getDeptId());
+        if (users != null && !users.isEmpty()) {
+            List<DeptAndUserTreeSelect> userChildren = users.stream()
+                    .map(DeptAndUserTreeSelect::new)
+                    .collect(Collectors.toList());
+            treeSelect.setUserList(userChildren);
+        }
+
+        if (!children.isEmpty()) {
+            treeSelect.setChildren(new ArrayList<>(children));
+        }
+
+        return treeSelect;
+    }
 }