From f7115db7eb622bcd2dd4ec62ce6f2b380a46bc08 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 14:50:52 +0800
Subject: [PATCH] 派遣，考试，工作汇报修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 79a047b..82124da 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -80,9 +80,6 @@
br.id = bu.role_id
where
bu.is_deleted = 0
- and bd.parent_id!=1425365577303621633
- and bd.id != 1425365577303621633
- and bd.id != 1432625856013971457
<if test="user.account!=null and user.account != ''">
and bu.account like concat('%', #{user.account},'%')
</if>
@@ -119,7 +116,10 @@
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat('%', #{user.cardid},'%')
</if>
- <if test="user.examinationType!=null and user.examinationType != ''">
+ <if test="user.examinationType==0">
+ and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
+ </if>
+ <if test="user.examinationType==1">
and bu.examination_type = #{user.examinationType}
</if>
ORDER BY bu.id
@@ -195,6 +195,8 @@
SELECT id, name, real_name RealName
FROM blade_user
where cardid = #{param1}
+ and is_deleted = 0
+ and status = 1
</select>
@@ -445,6 +447,7 @@
sys_dispatcher_unit sdu
on
sdu.id = sd.dispatcher_unit_id
+ left join
where
bu.dispatch =0
and bu.status = 1
--
Gitblit v1.9.3