From ac50102555227508a5c045016047f091c5b15a4c Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 24 Oct 2024 18:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E5=91=98=E6=A0=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/system/api/domain/SysDept.java | 11 +++ .../bonus/system/domain/vo/TreeSelect.java | 11 +++ .../resources/mapper/system/SysUserMapper.xml | 78 ++++++++++++++----- 3 files changed, 81 insertions(+), 19 deletions(-) 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 de02091..dfaa8bd 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 @@ -57,6 +57,16 @@ public class SysDept extends BaseEntity private List sysUsers; + private Integer level; + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + public Long getDeptId() { return deptId; @@ -208,6 +218,7 @@ public class SysDept extends BaseEntity .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) + .append("level", getLevel()) .toString(); } } 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 25ecf19..c704aed 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 @@ -32,6 +32,8 @@ public class TreeSelect implements Serializable { private String status; + private Integer level; + private List sysUsers; @@ -51,6 +53,7 @@ public class TreeSelect implements Serializable { this.status = dept.getStatus(); this.label = dept.getDeptName(); this.sysUsers = dept.getSysUsers(); + this.level = dept.getLevel(); this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } @@ -61,6 +64,14 @@ public class TreeSelect implements Serializable { this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + public Long getId() { return id; } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 3130283..1660ac9 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -207,26 +207,66 @@