From ac6fe634dc6db33818c17a76b7271f166b2edeb1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 21 十一月 2023 14:57:00 +0800
Subject: [PATCH] update 优化 使用动态租户重构业务对租户的逻辑
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
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 32f3e31..7af7dd0 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
@@ -14,10 +14,15 @@
<resultMap id="deptResult" type="org.dromara.system.domain.vo.SysDeptVo">
<id property="deptId" column="dept_id"/>
+ <result property="email" column="dept_email"/>
+ <result property="status" column="dept_status"/>
+ <result property="createTime" column="dept_create_time"/>
</resultMap>
<resultMap id="RoleResult" type="org.dromara.system.domain.vo.SysRoleVo">
<id property="roleId" column="role_id"/>
+ <result property="status" column="role_status"/>
+ <result property="createTime" column="role_create_time"/>
</resultMap>
<sql id="selectUserVo">
@@ -46,6 +51,8 @@
d.order_num,
d.leader,
d.status as dept_status,
+ d.email as dept_email,
+ d.create_time as dept_cteate_time,
r.role_id,
r.role_name,
r.role_key,
@@ -60,17 +67,21 @@
<select id="selectPageUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, 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.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ d.dept_name, d.leader, u1.user_name as leaderName
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
+ left join sys_user u1 on u1.user_id = d.leader
${ew.getCustomSqlSegment}
</select>
<select id="selectUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, 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.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+ d.dept_name, d.leader, u1.user_name as leaderName
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
+ left join sys_user u1 on u1.user_id = d.leader
${ew.getCustomSqlSegment}
</select>
@@ -105,21 +116,6 @@
<select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.del_flag = '0' and u.email = #{email}
- </select>
-
- <select id="selectTenantUserByUserName" parameterType="String" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.del_flag = '0' and u.user_name = #{userName} and u.tenant_id = #{tenantId}
- </select>
-
- <select id="selectTenantUserByPhonenumber" parameterType="String" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.del_flag = '0' and u.phonenumber = #{phonenumber} and u.tenant_id = #{tenantId}
- </select>
-
- <select id="selectTenantUserByEmail" parameterType="String" resultMap="SysUserResult">
- <include refid="selectUserVo"/>
- where u.del_flag = '0' and u.email = #{email} and u.tenant_id = #{tenantId}
</select>
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
--
Gitblit v1.9.3