From 9b2a7c4b452fc7ab52a020ee47073c193bb06908 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 二月 2023 14:30:35 +0800
Subject: [PATCH] update 更新 错误的版本号与已经升级的版本说明
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 d89d4b2..74e41b9 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
@@ -5,22 +5,24 @@
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<!-- 澶氱粨鏋勫祵濂楄嚜鍔ㄦ槧灏勯渶甯︿笂姣忎釜瀹炰綋鐨勪富閿甶d 鍚﹀垯鏄犲皠浼氬け璐� -->
- <resultMap type="com.ruoyi.system.domain.SysUser" id="SysUserResult">
+ <resultMap type="com.ruoyi.system.domain.vo.SysUserVo" id="SysUserResult">
<id property="userId" column="user_id"/>
+ <result property="deptId" column="dept_id"/>
<association property="dept" column="dept_id" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
- <resultMap id="deptResult" type="com.ruoyi.system.domain.SysDept">
+ <resultMap id="deptResult" type="com.ruoyi.system.domain.vo.SysDeptVo">
<id property="deptId" column="dept_id"/>
</resultMap>
- <resultMap id="RoleResult" type="com.ruoyi.system.domain.SysRole">
+ <resultMap id="RoleResult" type="com.ruoyi.system.domain.vo.SysRoleVo">
<id property="roleId" column="role_id"/>
</resultMap>
<sql id="selectUserVo">
select u.user_id,
+ u.tenant_id,
u.dept_id,
u.user_name,
u.nick_name,
@@ -58,17 +60,17 @@
<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 from
- sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
+ u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+ from sys_user u
+ left join sys_dept d on u.dept_id = d.dept_id
${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 from
- sys_user u
- left join sys_dept d on u.dept_id = d.dept_id
+ u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
+ from sys_user u
+ left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
</select>
--
Gitblit v1.9.3