From 34b6c77e9bcdca7bed5ed622ed22e7fe6b1961c2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 30 Aug 2021 15:21:29 +0800
Subject: [PATCH] 1.附件
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 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 e40c8c8..5e99b0d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -232,6 +232,14 @@
<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}
</if>
@@ -393,25 +401,50 @@
where bu.id = #{user.id}
</select>
- <select id="seleL" resultType="java.util.HashMap">
- SELECT
- *
- FROM
- blade_user where 1=1
- <if test="type!=null and type=='2'.toString()">
- and role_id='1414840172333842433' and `status`=1 AND is_deleted=0
- </if>
- <if test="type!=null and type=='1'.toString()">
- AND ( role_id = '1412226235153731586'
- OR role_id = '1416733602219110402') AND `status` = 1
- AND is_deleted = 0
- AND dept_id = '1425665656887545857'
- </if>
+ <select id="getDispaterInfo" resultType="java.util.HashMap">
+ select bu.*,sdu.jurisdiction from blade_user bu
+ left join
+ blade
+ left join
+ sys_dispatcher sd
+ on
+ bu.id = sd.user_ids
+ left join
+ sys_dispatcher_unit sdu
+ on
+ sdu.id = sd.dispatcher_unit_id
+ where
+ bu.dispatch =0
+ and bu.status = 1
+ and bu.is_deleted = 0
<if test="deptid!=null and deptid!=''">
- and dept_id=#{deptid}
+ and bu.dept_id = #{deptid}
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
- and jurisdiction=#{jurisdiction}
+ and sdu.jurisdiction = #{jurisdiction}
+ </if>
+ </select>
+
+ <!--获取工作汇报-->
+ <select id="getWorkReportInfo" 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
+ where
+ 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 dept_category=2
</if>
</select>
</mapper>
--
Gitblit v1.9.3