From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 e7e744b..822efbb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -54,7 +54,7 @@
<select id="selectUserPages" resultMap="userResultMap">
select
distinct
- bu.*,
+ bu.*,IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sexs,
sll.longitude,sll.latitude,
bd.dept_name
from
@@ -95,7 +95,7 @@
and bu.hold = #{user.hold}
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and bu.dept_id = #{user.deptId}
+ and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -108,6 +108,9 @@
</if>
<if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
and str.training_unit_id = #{user.trainingUnitId}
+ </if>
+ <if test="user.deptName!=null and user.deptName != ''">
+ and bd.dept_name like concat('%', #{user.deptName},'%')
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
@@ -140,19 +143,22 @@
on
bd.id = bu.dept_id
left join
- sys_information si
- on
- si.departmentid = bd.id
- left join
sys_jurisdiction sj
on
- sj.id = si.jurisdiction
+ sj.id = bu.jurisdiction
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where bu.is_deleted = 0
<if test="user.tenantId!=null and user.tenantId != ''">
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
and account like concat('%', #{user.account},'%')
+ </if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and br.role_alias = '公安管理员'
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
@@ -227,7 +233,7 @@
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMap">
select
- bu.*
+ bu.*,IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sexs
from
blade_user bu
left join
@@ -617,6 +623,7 @@
and bd.is_deleted = 0
and bd.id = #{user.deptId}
and br.role_alias = '保安'
+ and bu.dispatch = 1
)
</select>
--
Gitblit v1.9.3