From b4c58047eb182f395d647498f91de96e7f169a7a Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Mon, 28 Feb 2022 12:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xhpc/system/api/domain/SysUser.java  | 10 ++++++++++
 .../xhpc/system/service/impl/SysUserServiceImpl.java   |  2 ++
 .../src/main/resources/mapper/system/SysUserMapper.xml |  9 ++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java
index e82b745c..ff5b32a1 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xhpc/system/api/domain/SysUser.java
@@ -50,6 +50,11 @@ public class SysUser extends BaseEntity
      */
     private String tenantId;
 
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
     /**
      * 用户昵称
      */
@@ -410,6 +415,10 @@ public class SysUser extends BaseEntity
         this.menuIds = menuIds;
     }
 
+    public String getTenantName() {
+        return tenantName+":"+getTenantId();
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -437,6 +446,7 @@ public class SysUser extends BaseEntity
                 .append("remark", getRemark())
                 .append("dept", getDept())
                 .append("tenantId", getTenantId())
+                .append("tenantName", getTenantName())
             .toString();
     }
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java
index ced0ccbb..063219d2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -238,6 +239,7 @@ public class SysUserServiceImpl implements ISysUserService
     public int insertUser(SysUser user)
     {
         // 新增用户信息
+        user.setCreateTime(new Date());
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
         sysUserPostRoleService.insertUserPost(user);
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 9488a1a1..0f26a4ce 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -28,6 +28,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="remark" property="remark"/>
         <result column="tenant_id" property="tenantId"/>
+        <result column="tenant_name" property="tenantName"/>
         <result column="operator_id" property="operatorId"/>
         <association column="dept_id" property="dept" javaType="com.xhpc.system.api.domain.SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -93,9 +94,11 @@
     <select id="selectUserList" parameterType="com.xhpc.system.api.domain.SysUser" resultMap="SysUserResult">
         select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
         u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
-        u.tenant_id from
+        u.tenant_id,ten.tenant_name tenant_name
+        from
         sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
+        left JOIN xhpc_tenant ten on ten.tenant_id = u.tenant_id
         where u.del_flag = '0'
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')
@@ -103,6 +106,9 @@
         <if test="status != null and status != ''">
             AND u.status = #{status}
         </if>
+        <if test="tenantId != null and tenantId != ''">
+            AND u.tenant_id = #{tenantId}
+        </if>
         <if test="phonenumber != null and phonenumber != ''">
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
         </if>
@@ -237,6 +243,7 @@
             <if test="loginDate != null">login_date = #{loginDate},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="tenantId != null and ''!=tenantId">tenant_id = #{tenantId},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}