From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index 811f882..f77d627 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -146,7 +146,16 @@
select DISTINCT su.*, br.name as roleName from sys_user as su
left join base_role as br on su.role_id = br.id inner join sys_project as sp on su.id=sp.sys_user_id
where su.valid_flag = 1
- <include refid="queryWhereSql"/>
+ <if test="department != null and department != ''">
+ and su.department = #{department}
+ </if>
+ <if test="approverFlag != null">
+ and su.approver_flag = #{approverFlag}
+ </if>
+ <if test="project != null and project != ''">
+ and (su.project like concat('%',#{project},'%')
+ or su.project is null or su.project = '')
+ </if>
order by su.arp ASC
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
@@ -363,7 +372,7 @@
and su.arp like #{arp}
</if>
<if test="name != null and name != ''">
- and su.name like #{name}
+ and su.name like concat("%",#{name},"%")
</if>
<if test="departmentName != null and departmentName != ''">
and su.department like concat("%",#{departmentName},"%")
@@ -378,14 +387,19 @@
order by su.arp ASC
</select>
<select id="getLibrarianEmail" resultType="java.lang.String">
-
select su.email
from sys_user as su
left join base_role as br on br.id = su.role_id
- where br.name = '库管员'
+ where
+ su.valid_flag = 1
+ and br.name = '库管员'
and su.email is not null
and su.email != ''
</select>
+ <select id="getUserByName" resultMap="SysUser">
+ select * from sys_user
+ where name = #{name} and valid_flag = 1
+ </select>
<update id="updateUserPointBySelective" parameterType="java.util.Map">
update sys_user set point=#{point}
<where>
--
Gitblit v1.9.2