From 8b34a9baf45ac5d293f2fc8aacfe94c43070ce35 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 17 Aug 2021 09:54:54 +0800
Subject: [PATCH] 1.许可审批
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 7 ++++++-
1 files changed, 6 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 e5c50d2..b75551e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -105,6 +105,9 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and bu.examination_type = #{user.examinationType}
+ </if>
<if test="deptIdList!=null and deptIdList.size>0">
and bu.id in (
SELECT
@@ -154,6 +157,9 @@
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and securitynumber = #{user.securitynumber}
+ </if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and examination_type = #{user.examinationType}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
@@ -383,7 +389,6 @@
sa.user_id = bu.id
where 1=1
and (hold=2 or hold = 3)
- and (sa.is_exam != 1 or sa.is_exam is null)
and (bu.is_apply != 1 or bu.is_apply is null)
and (sa.apply_status !=2 or sa.apply_status is null)
and bu.dept_id = #{deptId}
--
Gitblit v1.9.3