From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 8 +++++++-
1 files changed, 7 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 3cb197d..76e8469 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -186,6 +186,7 @@
and account = #{param2}
and password = #{param3}
and is_deleted = 0
+ and status = 1
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
@@ -331,12 +332,17 @@
blade_dept bd
on
bu.dept_id = bd.id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
bu.is_deleted = 0
and bu.status = 1
- and bu.examination_type != 1
+ and (bu.examination_type != 1 or bu.examination_type is null)
and (hold = 2 or hold = 3)
and bd.id = #{user.deptId}
+ and br.role_alias = '保安'
<if test="user.examType==1">
and bu.is_apply != 1
</if>
--
Gitblit v1.9.3