From 9b10f135f3015c2175e54870d783fea9b8d8dea1 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 31 七月 2024 18:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/system/SysUserMapper.xml | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
index 194c2b2..08466cf 100644
--- a/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ycl-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -27,7 +27,7 @@
<association property="dept" javaType="com.ycl.system.entity.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
-
+
<resultMap id="deptResult" type="com.ycl.system.entity.SysDept">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
@@ -37,7 +37,7 @@
<result property="leader" column="leader" />
<result property="status" column="dept_status" />
</resultMap>
-
+
<resultMap id="RoleResult" type="com.ycl.system.entity.SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
@@ -46,7 +46,7 @@
<result property="dataScope" column="data_scope" />
<result property="status" column="role_status" />
</resultMap>
-
+
<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.create_by, u.create_time, u.remark, u.first_login,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
@@ -56,11 +56,11 @@
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
</sql>
-
+
<select id="selectUserList" parameterType="com.ycl.system.entity.SysUser" 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
- where u.del_flag = '0'
+ where u.del_flag = 0
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>
@@ -85,14 +85,14 @@
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
-
+
<select id="selectAllocatedList" parameterType="com.ycl.system.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
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
- where u.del_flag = '0' and r.role_id = #{roleId}
+ where u.del_flag = 0 and r.role_id = #{roleId}
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
@@ -102,14 +102,14 @@
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
-
+
<select id="selectUnallocatedList" parameterType="com.ycl.system.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
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
- where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
+ where u.del_flag = 0 and (r.role_id != #{roleId} or r.role_id IS NULL)
and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
@@ -120,27 +120,27 @@
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</select>
-
+
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
- where u.user_name = #{userName} and u.del_flag = '0'
+ where u.user_name = #{userName} and u.del_flag = 0
</select>
-
+
<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where u.user_id = #{userId}
</select>
-
+
<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
+ select user_id, user_name from sys_user where user_name = #{userName} and del_flag = 0 limit 1
</select>
-
+
<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
+ select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = 0 limit 1
</select>
-
+
<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
+ select user_id, email from sys_user where email = #{email} and del_flag = 0 limit 1
</select>
<select id="selectUserIdByNames" resultType="java.lang.Long">
@@ -181,7 +181,7 @@
sysdate()
)
</insert>
-
+
<update id="updateUser" parameterType="com.ycl.system.entity.SysUser">
update sys_user
<set>
@@ -202,28 +202,28 @@
</set>
where user_id = #{userId}
</update>
-
+
<update id="updateUserStatus" parameterType="com.ycl.system.entity.SysUser">
update sys_user set status = #{status} where user_id = #{userId}
</update>
-
+
<update id="updateUserAvatar" parameterType="com.ycl.system.entity.SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
-
+
<update id="resetUserPwd" parameterType="com.ycl.system.entity.SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
-
+
<delete id="deleteUserById" parameterType="Long">
update sys_user set del_flag = '2' where user_id = #{userId}
</delete>
-
+
<delete id="deleteUserByIds" parameterType="Long">
update sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
- </foreach>
+ </foreach>
</delete>
-
-</mapper>
\ No newline at end of file
+
+</mapper>
--
Gitblit v1.8.0