From 98662cb4c374e79e3a6ecdb5e0a7f9fa618dbd3b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 30 Aug 2021 16:15:39 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 7dc9f0c..78233e0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -88,7 +88,7 @@
and bu.role_id = #{user.roleId}
</if>
<if test="user.roleAlias!=null and user.roleAlias != ''">
- and (br.role_alias = '保安' or br.role_alias = '未持证保安')
+ and br.role_alias = '保安'
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
@@ -231,6 +231,14 @@
</if>
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
+ </if>
+ <if test="user.dispatch!=null and user.dispatch != ''">
+ <if test="user.dispatch==1">
+ and (bu.dispatch = #{user.dispatch} or bu.dispatch is null)
+ </if>
+ <if test="user.dispatch==0">
+ and bu.dispatch = #{user.dispatch}
+ </if>
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
@@ -393,10 +401,9 @@
where bu.id = #{user.id}
</select>
+ <!--获取派遣信息-->
<select id="getDispaterInfo" resultType="java.util.HashMap">
select bu.*,sdu.jurisdiction from blade_user bu
- left join
- blade
left join
sys_dispatcher sd
on
@@ -429,13 +436,14 @@
on
bd.id = si.departmentid
where
+ 1=1
and bu.status = 1
and bu.is_deleted = 0
<if test="deptid!=null and deptid!=''">
and bu.dept_id = #{deptid}
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
- and sdu.jurisdiction = #{jurisdiction}
+ and si.jurisdiction = #{jurisdiction}
and dept_category=2
</if>
</select>
--
Gitblit v1.9.3