From 44e912aba00c86c0148b8f7aa63e33b80c7ca954 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Feb 2023 13:10:11 +0800
Subject: [PATCH] =?UTF-8?q?/data/aggregator/epmetuser/stafflistbyrealname?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82mobile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/epmetuser/form/ListStaffFormDTO.java     | 5 +++++
 .../epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java    | 4 +++-
 .../service/epmetuser/impl/EpmetUserServiceImpl.java       | 2 +-
 .../main/resources/mapper/epmetuser/CustomerStaffDao.xml   | 7 ++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java
index e7569b16d1..4a2bd9687d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ListStaffFormDTO.java
@@ -25,4 +25,9 @@ public class ListStaffFormDTO implements Serializable {
     private String customerId;
     public interface Staff extends CustomerClientShowGroup {}
 
+    /**
+     * 手机号
+     * 可以不填
+     */
+    private String mobile;
 }
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 2319248c83..c6f991e732 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
@@ -53,7 +53,9 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Description 模糊查询用户、角色信息
      * @author sun
      */
-    List<ListStaffResultDTO> selectByRealName(@Param("customerId") String customerId, @Param("realName") String realName);
+    List<ListStaffResultDTO> selectByRealName(@Param("customerId") String customerId,
+                                              @Param("realName") String realName,
+                                              @Param("mobile") String mobile);
 
     /**
      * @Description 分页查询排好序的工作人员Id列表
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index d81bb9b1e7..34e0b45ad2 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -537,7 +537,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     @Override
     public List<ListStaffResultDTO> listStaff(ListStaffFormDTO formDTO) {
         //1.模糊查询用户、角色信息
-        List<ListStaffResultDTO> resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName());
+        List<ListStaffResultDTO> resultList = customerStaffDao.selectByRealName(formDTO.getCustomerId(), formDTO.getRealName(),formDTO.getMobile());
         if (null == resultList || resultList.size() < NumConstant.ONE) {
             return new ArrayList<>();
         }
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 2ee923a736..fe3eb13354 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
@@ -49,7 +49,12 @@
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        AND real_name LIKE CONCAT('%', #{realName}, '%')
+        <if test='null != realName and "" !=realName'>
+            AND real_name LIKE CONCAT('%', #{realName}, '%')
+        </if>
+        <if test='null != mobile and "" !=mobile'>
+            and MOBILE LIKE CONCAT('%', #{mobile}, '%')
+        </if>
     </select>
 
     <select id="selectOrderRole" resultType="java.lang.String">