From 074c6c4389938fc38e82b6258b8ebab95fb5aff9 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 16 九月 2021 15:54:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 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..f5da893 100644 --- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml +++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml @@ -363,7 +363,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 +378,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