From 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 03 二月 2021 15:48:28 +0800
Subject: [PATCH] 取消领用

---
 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 8bb1b6b..06c7961 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -74,6 +74,12 @@
     <if test="waster != null">
         and su.waster = #{waster}
     </if>
+    <if test="project != null and project != ''">
+        and su.project like concat("%",#{project},"%")
+    </if>
+    <if test="company != null and company != ''">
+         and bm1.meta_value like concat("%",#{company},"%")
+    </if>
   </sql>
 
   <select id="getSysUser" parameterType="java.lang.String"  resultMap="SysUser" >
@@ -117,6 +123,7 @@
     select su.*, br.name as roleName from sys_user as su
     left join base_role as br on su.role_id = br.id
       left join base_meta bm on su.department = bm.id
+      left join base_meta bm1 on bm1.id = su.company
     where su.valid_flag = 1
       <if test="departmentNameLike != null and departmentNameLike != ''">
           and bm.meta_value  like #{departmentNameLike}
@@ -150,7 +157,9 @@
   </select>
 
   <select id="getSysUserTotalCount" parameterType="java.util.Map" resultType="int">
-    select count(1) from sys_user as su left join base_meta bm on su.department = bm.id
+    select count(1) from sys_user as su
+    left join base_meta bm on su.department = bm.id
+    left join base_meta bm1 on bm1.id = su.company
     where su.valid_flag = 1
       <if test="departmentNameLike != null and departmentNameLike != ''">
           and bm.meta_value  like #{departmentNameLike}
@@ -263,6 +272,10 @@
     AND waster = '1'
     AND project = #{project};
     </select>
+    <select id="getUserByArp" resultMap="SysUser">
+        select * from sys_user
+        where arp = #{0} and valid_flag = 1
+    </select>
     <update id="updateUserPointBySelective" parameterType="java.util.Map">
     update sys_user set point=#{point}
     <where>

--
Gitblit v1.9.2