From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug

---
 src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index 0bfab6b..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}
@@ -387,6 +396,10 @@
         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