From 284a9a6b482347a9fe65223a3280421d6a65e2e4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 08 May 2021 11:37:17 +0800
Subject: [PATCH] 1.处警队伍列表接口修改 2.近一周警情接口修改，返回一键求助 3.报警设备报警时bug修复，新增判断接警员的在线状态和工作状态是否为空
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 7c7f9ae..f902ee9 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -55,6 +55,7 @@
<result column="work_status" property="work_status"/>
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
+ <result column="dept_name" property="deptName"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -139,11 +140,11 @@
</select>
<!--查询处警人员列表-->
- <select id="selectSecurityUserPageList" resultType="org.springblade.system.user.vo.UsersVo">
- SELECT bu.id,bu.name,bu.code,bu.real_name realName,bu.account,
- bu.email,bu.phone,bu.birthday,bu.create_time createTime,
+ <select id="selectSecurityUserPageList" resultMap="userResultMaps">
+ SELECT bu.id,bu.name,bu.code,bu.real_name,bu.account,
+ bu.email,bu.phone,bu.birthday,bu.create_time,
bu.sex,ifnull(bu.online_status,0) online_status,
- bd.dept_name deptName,p.jd,p.wd FROM blade_user bu
+ bd.dept_name,p.jd,p.wd FROM blade_user bu
LEFT JOIN
jfpt.sys_position p
on
@@ -158,6 +159,7 @@
bu.role_id=br.id
where
br.role_alias ='处警员'
+ and bu.is_deleted=0
<if test="user.realName!=null and user.realName !=''">
<bind name="realName" value="'%'+user.realName+'%'"/>
and bu.real_name like #{realName}
--
Gitblit v1.9.3