From 16b704d18a875d1fb63827aaa507790ba2bef5be Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 23 四月 2024 11:44:13 +0800
Subject: [PATCH] JK最终代码提交
---
guns-management/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml b/guns-management/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
index 2245460..23ae3c9 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
@@ -49,7 +49,7 @@
<if test="deptid != null and deptid != 0">
and (deptid = #{deptid} or deptid in ( select id from sys_dept where pids like CONCAT('%[', #{deptid}, ']%') ))
</if>
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ <if test="beginTime != null and endTime != null">
and (createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
</select>
@@ -81,15 +81,20 @@
<select id="getUsers" resultType="java.util.Map">
SELECT us.id,us.createtime,us.account,us.`name`,us.sex,sr.`name` as roleName,sd.simplename as deptName,us.email,us.phone,us.`status`
from sys_user us
- LEFT JOIN sys_role sr ON us.roleid = sr.id
- LEFT JOIN sys_dept sd on us.deptid = sd.id
+ LEFT JOIN sys_role sr ON us.roleid = sr.id
+ LEFT JOIN sys_dept sd on us.deptid = sd.id
<where>
- us.status != 3
- <if test="null != account and '' != account">
- and us.account like CONCAT('%', #{account}, '%')
+ us.status != 3
+ <if test="null != phone and '' != phone">
+ and us.phone like CONCAT('%', #{phone}, '%')
+ </if>
+ <if test="null != name and '' != name">
+ and us.name like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != deptName and '' != deptName">
+ and sd.simplename like CONCAT('%', #{deptName}, '%')
</if>
</where>
-
-
+ order by us.createtime desc
</select>
</mapper>
--
Gitblit v1.7.1