From c04f2d4a58bd72449b2212ed2f8b0c3ac9ec96be Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 12 八月 2025 11:04:16 +0800
Subject: [PATCH] 修改
---
hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml b/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml
index 00ed8b1..60f0ced 100644
--- a/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -36,11 +36,11 @@
<select id="getUserByUsername" resultMap="SysUserResult">
select id,username,name,password,user_type,company_id,status,del_flag from sys_user
- where username=#{username} limit 1
+ where username=#{username} and del_flag=0 limit 1
</select>
<select id="userList" resultMap="SysUserResult">
- select u.id,u.username,u.name,u.user_type,u.phone,u.company_id,u.depart_id,u.sex,u.status,u.del_flag,
+ select u.id,u.username,u.name,u.user_type,u.phone,u.company_id,u.depart_id,u.sex,u.status,u.del_flag,u.version,
u.login_ip,u.login_date,u.create_by,u.create_time,u.remark,c.name as company_name,d.name as depart_name
from sys_user u
left join sys_company c on c.id=u.company_id
@@ -49,6 +49,9 @@
and u.del_flag = 0
<if test="username != null and username != ''">
AND u.username like concat('%', #{username}, '%')
+ </if>
+ <if test="name!=null and name!=''">
+ and u.name like concat('%',#{name},'%')
</if>
<if test="status != null and status != ''">
AND u.status = #{status}
@@ -79,11 +82,11 @@
<select id="getUserByPhone" resultMap="SysUserResult">
select id,username,name,password,company_id,phone,status,del_flag from sys_user
- where phone=#{phone} and del_flag=0
+ where phone=#{phone} and del_flag=0 limit 1
</select>
<select id="getUserById" resultMap="SysUserResult">
- select u.id,u.username,u.user_type,u.name,u.phone,u.company_id,u.depart_id,u.status,u.sex,u.del_flag,c.name as company_name,d.name as depart_name
+ select u.id,u.username,u.user_type,u.name,u.phone,u.company_id,u.depart_id,u.status,u.sex,u.del_flag,u.version,c.name as company_name,d.name as depart_name
from sys_user u
left join sys_company c on c.id=u.company_id
left join sys_dept d on d.id=u.depart_id
--
Gitblit v1.9.2