From 1403165f3ebdf6966f9b15deb75de30393e3b988 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 17 Jun 2025 15:53:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E5=91=98=E6=A0=91?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=AD=BB=E5=BE=AA=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/system/api/domain/SysDept.java | 13 +++++++++++++ .../bonus/system/controller/SysUserController.java | 2 +- .../java/com/bonus/system/domain/vo/TreeSelect.java | 11 +++++++++++ .../main/resources/mapper/system/SysDeptMapper.xml | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java index da59c92..180d3db 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java @@ -24,6 +24,11 @@ public class SysDept extends BaseEntity { */ private Long deptId; + /** + * 人员部门树节点id + */ + private Long nodeId; + /** * 父部门ID */ @@ -287,6 +292,14 @@ public class SysDept extends BaseEntity { this.deptId = deptId; } + public Long getNodeId() { + return nodeId; + } + + public void setNodeId(Long nodeId) { + this.nodeId = nodeId; + } + public Long getParentId() { return parentId; } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index b930a97..2d6f130 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -490,7 +490,7 @@ public class SysUserController extends BaseController { /** * 查询部门人员树列表 */ - @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) + //@RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) @PostMapping("/deptUserTree") public AjaxResult deptUserTree(@RequestBody SysUser sysUser) { try { diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java index ce53097..88d7c80 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/vo/TreeSelect.java @@ -25,6 +25,8 @@ public class TreeSelect implements Serializable { /** 父部门ID */ private Long parentId; + private Long nodeId; + /** * 节点名称 */ @@ -48,6 +50,7 @@ public class TreeSelect implements Serializable { public TreeSelect(SysDept dept) { this.id = dept.getDeptId(); this.parentId = dept.getParentId(); + this.nodeId = dept.getNodeId(); this.status = dept.getStatus(); this.label = dept.getDeptName(); this.level = dept.getLevel(); @@ -85,6 +88,14 @@ public class TreeSelect implements Serializable { this.parentId = parentId; } + public Long getNodeId() { + return nodeId; + } + + public void setNodeId(Long nodeId) { + this.nodeId = nodeId; + } + public String getLabel() { return label; } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml index 2a21a3c..244c64e 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT d.dept_id AS deptId, d.parent_id AS parentId, + d.dept_id as nodeId, d.dept_name AS deptName, LENGTH( d.ancestors ) - LENGTH( REPLACE ( d.ancestors, ',', '' )) AS LEVEL @@ -129,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT CONCAT(sd.dept_id,'9999',su.user_id) AS deptId, sd.dept_id AS parentId, + su.user_id as nodeId, su.nick_name AS deptName, 99 AS LEVEL FROM