From 87f6c0def1451cb575f5d2fede442aaa02ac1325 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 11:30:44 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
index aa57ef3..74e1f8c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
@@ -24,7 +24,7 @@
<result property="updateTime" column="update_time" />
<result property="forbiddenRemark" column="forbidden_remark"/>
<result property="remark" column="remark" />
- <result property="roleType" column="roleType" />
+ <result property="roleType" column="role_type" />
<result property="objectId" column="objectId" />
<association property="dept" column="dept_id" javaType="com.ruoyi.system.api.domain.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
@@ -51,7 +51,7 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.role_type, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
- r.role_id, r.role_name, r.role_key, r.data_scope, r.status as role_status ,u.roleType as roleType,u.objectId AS objectId
+ r.role_id, r.role_name, r.role_key, r.data_scope, r.status as role_status ,u.role_type as roleType,u.objectId AS objectId
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
@@ -142,11 +142,11 @@
<if test="null != req.status">
and status = #{req.status}
</if>
- and del_flag = '0' and roleType =1
+ and del_flag = '0' and role_type =1
order by create_time desc
</select>
<select id="getAllList" resultType="com.ruoyi.system.api.domain.SysUser">
- select *,user_id userId,nick_name userName ,create_time createTime ,login_date loginDate from sys_user where roleType=3 and user_id in
+ select *,user_id userId,nick_name userName ,create_time createTime ,login_date loginDate from sys_user where role_type=3 and user_id in
<foreach collection="ids" separator="," open="(" item="id" index="index" close=")" >
#{id}
@@ -169,7 +169,7 @@
AND nick_name LIKE concat('%',#{query.nickName},'%')
</if>
AND del_flag = '0'
- AND roleType = 1
+ AND role_type = 1
</where>
ORDER BY create_time DESC
</select>
@@ -187,7 +187,7 @@
<if test="password != null and password != ''">password,</if>
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
- <if test="roleType != null and roleType != ''">roleType,</if>
+ <if test="roleType != null and roleType != ''">role_type,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="objectId != null and objectId != ''">objectId,</if>
create_time
--
Gitblit v1.7.1