From 41c654be651fd12fe77a280eaf58e4ca05d58420 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 23:42:50 +0800
Subject: [PATCH] 1.处警员列表接口修改 2.设备更新接口修改

---
 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml |    9 +++++----
 1 files changed, 5 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..3bede8c 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

--
Gitblit v1.9.3