From 33be5ced8e510ad33c93251d8c475d1fe143ec89 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 26 Nov 2021 17:28:39 +0800
Subject: [PATCH] 用户审查查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 519b3dc..9611e56 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -258,6 +258,9 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if>
+ <if test="user.type!=null">
+ and bu.equipment_code !="" and bu.equipment_code is not null and bu.equipment_code !=null
+ </if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
@@ -324,7 +327,8 @@
<select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
select id, cardid
from blade_user
- where examination_type is null
+ where 1=1
+ and (examination_type is null or examination_type="" or examination_type=null)
</select>
<!--根据保安员编码查询保安信息-->
--
Gitblit v1.9.3