From 0eb4da078b5668d5d3b7795e11e3f335927ad3da Mon Sep 17 00:00:00 2001
From: wanglei <921888199@qq.com>
Date: Tue, 6 Dec 2022 11:44:37 +0800
Subject: [PATCH] =?UTF-8?q?sysuser=20=E8=8E=B7=E5=8F=96orgname=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8easy=20trans=E6=96=B9=E5=BC=8F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=A1=A8=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java | 7 ++++++-
 maku-boot-system/src/main/resources/mapper/SysUserDao.xml        | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java
index 3a075e6..97f43a3 100644
--- a/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java
+++ b/maku-boot-system/src/main/java/net/maku/system/vo/SysUserVO.java
@@ -2,9 +2,13 @@ package net.maku.system.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import net.maku.framework.common.utils.DateUtils;
+import net.maku.system.entity.SysOrgEntity;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.Email;
@@ -21,7 +25,7 @@ import java.util.List;
  */
 @Data
 @Schema(description = "用户")
-public class SysUserVO implements Serializable {
+public class SysUserVO implements Serializable, TransPojo {
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "id")
@@ -56,6 +60,7 @@ public class SysUserVO implements Serializable {
 
     @Schema(description = "机构ID", required = true)
     @NotNull(message = "机构ID不能为空")
+    @Trans(type = TransType.SIMPLE,target = SysOrgEntity.class,fields = "name",ref = "orgName")
     private Long orgId;
 
     @Schema(description = "状态 0：停用    1：正常", required = true)
diff --git a/maku-boot-system/src/main/resources/mapper/SysUserDao.xml b/maku-boot-system/src/main/resources/mapper/SysUserDao.xml
index f9dcd2b..a875861 100644
--- a/maku-boot-system/src/main/resources/mapper/SysUserDao.xml
+++ b/maku-boot-system/src/main/resources/mapper/SysUserDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="net.maku.system.dao.SysUserDao">
 
 	<select id="getList" resultType="net.maku.system.entity.SysUserEntity">
-		select t1.*, (select t2.name from sys_org t2 where t2.id = t1.org_id) orgName
+		select t1.*
 			from sys_user t1 where t1.super_admin = 0 and t1.deleted = 0
 		<if test="username != null and username.trim() != ''">
 			and t1.username = #{username}