From b7c453de49343990a97fd033b39116bddfec816a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 14 Jul 2021 20:47:53 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 c534acf..2d7d5d5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -27,6 +27,8 @@
<result column="post_id" property="postId"/>
<result column="online_status" property="online_status"/>
<result column="work_status" property="work_status"/>
+ <result column="examination_type" property="examination_type"/>
+ <result column="examination_mx" property="examination_mx"/>
</resultMap>
<resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UsersVo">
<result column="id" property="id"/>
@@ -54,6 +56,8 @@
<result column="work_status" property="work_status"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
+ <result column="examination_type" property="examination_type"/>
+ <result column="examination_mx" property="examination_mx"/>
<result column="dept_name" property="deptName"/>
</resultMap>
@@ -94,8 +98,11 @@
select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
LEFT JOIN sys_position p ON p.snumber = s.CODE
LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
-
- where s.is_deleted = 0
+ left join
+ blade_role br
+ on
+ s.role_id=br.id
+ where s.is_deleted = 0 and br.role_alias ='处警员'
<if test="user.account!=null and user.account != ''">
and s.account = #{user.account}
</if>
@@ -108,6 +115,9 @@
<if test="user.userType!=null and user.userType != ''">
and s.user_type = #{user.userType}
</if>
+ <if test="user.examination_type!=null and user.examination_type != ''">
+ and s.examination_type = #{user.examination_type}
+ </if>
<if test="deptIdList!=null and deptIdList.size>0">
and s.id in (
SELECT
--
Gitblit v1.9.3