From 59ada443c6de6f237ff8ce5ba6e7a78bff318c84 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 19 Aug 2021 17:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/epmetuser/result/ListStaffResultDTO.java      | 2 ++
 .../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java
index 8acbb434ab..d9fe352c1e 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ListStaffResultDTO.java
@@ -23,6 +23,8 @@ public class ListStaffResultDTO implements Serializable {
     private String headPhoto = "";
     //手机号
     private String mobile = "";
+    //未禁用enable,已禁用disabled
+    private String enableFlag = "";
     //人员新增所属组织名【组织-组织，组织-部门，组织-网格】
     private String orgName = "";
     //职责名称列表
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
index 8736d1e3bf..437c70005f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
@@ -37,6 +37,7 @@
         <result property="gender" column="gender"/>
         <result property="headPhoto" column="head_photo"/>
         <result property="mobile" column="mobile"/>
+        <result property="enableFlag" column="enable_flag"/>
         <association property="roles" column="user_id" select="com.epmet.dataaggre.dao.epmetuser.StaffRoleDao.selectByStaffId"/>
     </resultMap>
     <select id="selectByRealName" resultMap="staffList">