From df577d901e09267d2e2ef597d063e3d6f3454bff Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 25 Aug 2021 18:00:05 +0800
Subject: [PATCH] 用户审查接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 16 ++++++++--------
1 files changed, 8 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 1e2d4ab..9b97357 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -155,6 +155,7 @@
on
si.departmentid = bu.dept_id
where is_deleted = 0
+ and status = 1
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -173,12 +174,9 @@
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
</if>
- <if test="user.status!=null and user.status != ''">
- and bu.status = #{user.status}
- </if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1123598813738675201'">
and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
@@ -191,7 +189,7 @@
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
select
- bu.*
+ bu.*,bd.dept_name as deptName
from
blade_user bu
left join
@@ -228,6 +226,9 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
+ <if test="user.deptId!=null and user.deptId!=''">
+ and bu.dept_id =#{user.deptId}
+ </if>
<if test="user.useName==null or user.useName==''">
order by bu.id
</if>
@@ -263,10 +264,9 @@
select id,cardid from blade_user where is_deleted = 0
</select>
- <!--查询用户数据,未删除的,未审核的-->
+ <!--查询用户数据,未审核的-->
<select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
- select id,cardid from blade_user where is_deleted = 0
- and (examination_type!='0' or examination_type is null)
+ select id,cardid from blade_user where examination_type is null
</select>
</mapper>
--
Gitblit v1.9.3