From 8e99321db3dfeedaf910c7a7c7f5afde60caafb7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 May 2022 15:21:08 +0800
Subject: [PATCH] 枪支,派遣单位,考试成绩保存,成绩审查,主要管理人员,出资人,用户导入,新增,许可证信息等信息修改变动

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 142a8b9..176b471 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -555,7 +555,7 @@
             select #{user.deptId} as id,
                 '全部' as name,
                 0 as parentId
-                from blade_user
+                from blade_user limit 1
         )
 
         union all
@@ -587,7 +587,7 @@
                 where
                 bu.is_deleted = 0
                 and bu.status = 1
-                and (bu.examination_type != 1 or bu.examination_type is null)
+                and ((bu.examination_type != 1 and bu.examination_type != 2) or bu.examination_type is null)
                 and (hold = 2 or hold = 3)
                 and bd.id = #{user.deptId}
                 and br.role_alias = '保安'

--
Gitblit v1.9.3