From 77f49ad33202afaccd7dc2753d502bdd7472fe33 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Tue, 14 Nov 2023 21:34:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=9E=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/lihongjie/coal/user/dto/UserDto.java | 2 ++ src/main/java/cn/lihongjie/coal/user/entity/UserEntity.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java b/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java index f56b64a3..f72675fa 100644 --- a/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java +++ b/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java @@ -28,6 +28,8 @@ public class UserDto extends OrgCommonDto { @Comment("系统管理员标识") private Boolean sysAdmin; + private String organizationName; + private List roles; private List otherRoles; diff --git a/src/main/java/cn/lihongjie/coal/user/entity/UserEntity.java b/src/main/java/cn/lihongjie/coal/user/entity/UserEntity.java index f027fd35..6b67cd26 100644 --- a/src/main/java/cn/lihongjie/coal/user/entity/UserEntity.java +++ b/src/main/java/cn/lihongjie/coal/user/entity/UserEntity.java @@ -9,6 +9,7 @@ import lombok.Data; import org.hibernate.annotations.Cache; import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; import java.util.ArrayList; import java.util.List; @@ -51,6 +52,9 @@ public class UserEntity extends OrgCommonEntity { @Comment("系统管理员标识") private Boolean sysAdmin; + @Formula("(select tu.name from t_organization tu where tu.id = organization_id)") + private String organizationName; + public List allRoles() { List allRoles = new ArrayList<>(this.roles);