From 37325b5b629a296230e87d41187742f843c7494c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 15 七月 2025 18:08:23 +0800
Subject: [PATCH] 文件ip迁移兼容
---
system/src/main/resources/mapper/system/SysUserMapper.xml | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/system/src/main/resources/mapper/system/SysUserMapper.xml b/system/src/main/resources/mapper/system/SysUserMapper.xml
index b9ec9d2..abf1553 100644
--- a/system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hnct.system.mapper.SysUserMapper">
+<mapper namespace="com.ycl.system.mapper.SysUserMapper">
- <resultMap type="com.hnct.system.domain.SysUser" id="SysUserResult">
+ <resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="userName" column="user_name" />
@@ -23,21 +23,23 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
- <association property="dept" javaType="com.hnct.system.domain.SysDept" resultMap="deptResult" />
+ <association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
- <resultMap id="deptResult" type="com.hnct.system.domain.SysDept">
+ <resultMap id="deptResult" type="SysDept">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="deptName" column="dept_name" />
<result property="ancestors" column="ancestors" />
<result property="orderNum" column="order_num" />
<result property="leader" column="leader" />
+ <result property="phone" column="phone" />
<result property="status" column="dept_status" />
+ <result property="parentName" column="parent_name" />
</resultMap>
- <resultMap id="RoleResult" type="com.hnct.system.domain.SysRole">
+ <resultMap id="RoleResult" type="SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
<result property="roleKey" column="role_key" />
@@ -48,7 +50,8 @@
<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,
- d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+ d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.status as dept_status,
+ (select dept_name from sys_dept where dept_id = d.parent_id) parent_name,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
@@ -56,7 +59,7 @@
left join sys_role r on r.role_id = ur.role_id
</sql>
- <select id="selectUserList" parameterType="com.hnct.system.domain.SysUser" resultMap="SysUserResult">
+ <select id="selectUserList" parameterType="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'
@@ -66,6 +69,9 @@
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
+ <if test="nickName != null and nickName != ''">
+ AND u.nick_name like concat('%', #{nickName}, '%')
+ </if>
<if test="status != null and status != ''">
AND u.status = #{status}
</if>
@@ -73,10 +79,10 @@
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- AND date_format(u.create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
+ AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
+ AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="deptId != null and deptId != 0">
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
@@ -85,7 +91,7 @@
${params.dataScope}
</select>
- <select id="selectAllocatedList" parameterType="com.hnct.system.domain.SysUser" resultMap="SysUserResult">
+ <select id="selectAllocatedList" parameterType="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
@@ -102,7 +108,7 @@
${params.dataScope}
</select>
- <select id="selectUnallocatedList" parameterType="com.hnct.system.domain.SysUser" resultMap="SysUserResult">
+ <select id="selectUnallocatedList" parameterType="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
@@ -130,6 +136,11 @@
where u.user_id = #{userId}
</select>
+ <select id="selectUserByIds" parameterType="Long" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.user_id in <foreach collection="userIds" open="(" separator="," close=")" item="userId">#{userId}</foreach>
+ </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>
@@ -142,7 +153,7 @@
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
- <insert id="insertUser" parameterType="com.hnct.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
+ <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -174,7 +185,7 @@
)
</insert>
- <update id="updateUser" parameterType="com.hnct.system.domain.SysUser">
+ <update id="updateUser" parameterType="SysUser">
update sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
@@ -195,15 +206,15 @@
where user_id = #{userId}
</update>
- <update id="updateUserStatus" parameterType="com.hnct.system.domain.SysUser">
+ <update id="updateUserStatus" parameterType="SysUser">
update sys_user set status = #{status} where user_id = #{userId}
</update>
- <update id="updateUserAvatar" parameterType="com.hnct.system.domain.SysUser">
+ <update id="updateUserAvatar" parameterType="SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
- <update id="resetUserPwd" parameterType="com.hnct.system.domain.SysUser">
+ <update id="resetUserPwd" parameterType="SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
@@ -218,4 +229,7 @@
</foreach>
</delete>
+ <select id="getByDept" resultMap="SysUserResult">
+ select * from sys_user where dept_id = #{deptId} and del_flag = '0'
+ </select>
</mapper>
--
Gitblit v1.8.0