From f708492681b9ae25d6029c8c6c0cd9bc5d20b997 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 20 十月 2023 12:25:51 +0800
Subject: [PATCH] update 限制框架中的fastjson版本
---
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 0b67a33..52c1aa4 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,15 +14,15 @@
<resultMap id="deptResult" type="org.dromara.system.domain.vo.SysDeptVo">
<id property="deptId" column="dept_id"/>
- <id property="email" column="dept_email"/>
- <id property="status" column="dept_status"/>
- <id property="createTime" column="dept_create_time"/>
+ <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"/>
- <id property="status" column="role_status"/>
- <id property="createTime" column="role_create_time"/>
+ <result property="status" column="role_status"/>
+ <result property="createTime" column="role_create_time"/>
</resultMap>
<sql id="selectUserVo">
@@ -67,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>
--
Gitblit v1.9.3