From f63fff71fcd7a62ad73b0b9eda614f3b1fa3badf Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 22 Oct 2021 22:51:09 +0800
Subject: [PATCH] 考试成绩修改状态重置
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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..c2e1386 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">
@@ -208,7 +209,10 @@
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
SELECT id, name, real_name RealName
FROM blade_user
- where cardid = #{param1}
+ where 1=1
+ and is_deleted = 0
+ and status = 1
+ and cardid = #{param1}
</select>
@@ -331,12 +335,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>
@@ -510,7 +519,10 @@
<!--查询账号相同的数量-->
<select id="selectCountAccount" resultType="java.lang.Integer">
- select count(*) from blade_user where account = #{account}
+ select count(*) from blade_user where 1=1
+ and status = 1
+ and is_deleted = 0
+ and account = #{account}
</select>
<!--查询当前部门名称及父级部门名称-->
@@ -529,4 +541,34 @@
and is_deleted = 0
and status = 1
</select>
+
+
+ <!--现场检查获取保安员-->
+ <select id="getSecurityInfo" resultType="java.util.HashMap">
+ select bu.*,si.jurisdiction from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ left join
+ sys_information si
+ on
+ bd.id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
+ where
+ 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ </if>
+ and bu.status = 1
+ and bu.is_deleted = 0
+ and br.role_alias = "保安"
+ </select>
</mapper>
--
Gitblit v1.9.3