From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/resources/mapper/UserMapper.xml | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/resources/mapper/UserMapper.xml b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
index 7186188..2ade598 100644
--- a/cloud-server-management/src/main/resources/mapper/UserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
@@ -34,7 +34,7 @@
id, account, name, birthday,password, sex, email, avatar,
phone, roleid,salt,
deptid, status,
- createtime, version
+ createtime, version,objectType,objectId
</sql>
<select id="selectUsers" resultType="map">
@@ -106,8 +106,44 @@
<if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
and (o.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
</if>
+ <if test="objectType ==3">
+ and (o.objectType =3 and o.objectId =#{objectId})
+ </if>
+ <if test="objectType ==1">
+ and o.objectType =1
+ </if>
</where>
order by o.id desc
</select>
+ <select id="searchUsers" resultType="com.dsh.guns.modular.system.model.UserListVO">
+ select t1.id,t1.name ,t1.phone ,t1.avatar,t1.birthday,t1.sex,t1.idCard,t1.status,t1.version
+ ,t2.simplename as deptName from sys_user t1
+ left join sys_dept t2 on t1.deptid = t2.id
+ <where>
+ <if test="query.name != null and query.name != ''">
+ and t1.name like CONCAT('%',#{query.name},'%')
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ and t1.phone like CONCAT('%',#{query.phone},'%')
+ </if>
+ <if test="query.idCard != null and query.idCard != ''">
+ and t1.idCard like CONCAT('%',#{query.idCard},'%')
+ </if>
+ <if test="query.isSales == 1">
+ and (t2.simplename like CONCAT('%','销售','%')
+ or t2.fullname like CONCAT('%','销售','%'))
+ </if>
+ <if test="query.status != null and query.status != ''">
+ and t1.status = #{query.status}
+ </if>
+ <if test="query.storeIds != null and query.storeIds.size()>0">
+ AND t1.id IN
+ <foreach collection="query.storeIds" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
+ and t1.status != 3
+ </where>
+ </select>
</mapper>
--
Gitblit v1.7.1