From bafe10232e18d07f731a74c8df4e63b4cd06b70b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 17 Sep 2021 15:10:20 +0800
Subject: [PATCH] 1.用户新增审查时间 2.派遣更改修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 28 ++++++++++++----------------
1 files changed, 12 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 ca3b0e2..7123f03 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -47,6 +47,7 @@
<result column="birthtime" property="birthtime"/>
<result column="healstats" property="healstats"/>
<result column="soil" property="soil"/>
+ <result column="reason_for_leav" property="reasonForLeav"/>
</resultMap>
<!--带坐标-->
@@ -157,19 +158,6 @@
<if test="user.examinationType!=null and user.examinationType != ''">
and examination_type = #{user.examinationType}
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and id in (
- SELECT
- user_id
- FROM
- blade_user_dept
- WHERE
- dept_id IN
- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- )
- </if>
ORDER BY id
</select>
@@ -276,7 +264,7 @@
and bu.dept_id = #{user.deptId}
</if>
<if test="user.isApply!=null">
- and sa.is_apply = #{user.isApply}
+ and bu.is_apply = #{user.isApply}
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -441,6 +429,10 @@
sys_information si
on
bd.id = si.departmentid
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
1=1
and bu.status = 1
@@ -450,7 +442,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and si.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
@@ -462,6 +454,10 @@
blade_dept bd
on
bd.id = bu.dept_id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
1=1
and bu.status = 1
@@ -471,7 +467,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and bu.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
--
Gitblit v1.9.3