From eecc42b0986847fd17effe2dca5fa2e8e847b819 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 23 Nov 2022 11:12:39 +0800
Subject: [PATCH] =?UTF-8?q?/data/aggregator/org/staff-select-list=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dataaggre/controller/GovOrgController.java   | 2 +-
 .../com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java     | 1 +
 .../src/main/resources/mapper/epmetuser/CustomerStaffDao.xml    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
index bbf8011130..67fd1c711d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java
@@ -189,7 +189,7 @@ public class GovOrgController {
 
     /**
      * 组织下的工作人员 下拉框
-     *
+     * 2022.11.23调整：已经禁用的人，不展示
      * @param tokenDto
      * @param agencyId
      * @return
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java
index 39f67d2af1..2319248c83 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java
@@ -75,6 +75,7 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
 
     /**
      * 根据staffId查询姓名、手机号
+     * 禁用的不展示
      * @param staffIds
      * @return
      */
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 9ac36b2509..2ee923a736 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
@@ -140,6 +140,7 @@
         AND USER_ID = #{staffId}
     </select>
 
+    <!--    禁用的不展示 -->
     <select id="staffSelectList" parameterType="map" resultType="com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO">
         SELECT
             cs.USER_ID as `value`,
@@ -150,6 +151,7 @@
             customer_staff cs
         WHERE
             cs.del_flag = '0'
+            and cs.ENABLE_FLAG='enable'
         <foreach item="staffId" collection="staffIds" open="and (" separator="or" close=")">
             cs.user_id = #{staffId}
         </foreach>