From 3ea067e6454e9fef09a0d8fd585cf3d664b3e35e Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 24 Feb 2022 10:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=A7=9F=E6=88=B7=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/system/api/domain/SysUser.java | 5 +++++ .../src/main/resources/mapper/system/SysUserMapper.xml | 2 ++ 2 files changed, 7 insertions(+) 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..7b5cf141 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; + /** * 用户昵称 */ 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..5412687f 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 @@ -83,11 +83,13 @@ r.status as role_status, u.user_type, u.tenant_id, + t.tenant_name, u.operator_id from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id + inner join xhpc_tenant t on u.tenant_id=t.tenant_id and t.is_deleted=0 and t.status=1