From b24045f383a72f1010db0825c5e8c92d6106a710 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 13 Aug 2020 16:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E4=BB=8Euser=5Fcustomer=E6=9F=A5=E8=AF=A2(=E9=A6=96=E6=AC=A1?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id=E4=BB=A5=E5=8F=8A[?=
 =?UTF-8?q?=E9=9D=9E=E9=A6=96=E6=AC=A1]=E6=B3=A8=E5=86=8C=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91Id)=E6=94=B9=E6=88=90=E4=BB=8Eregister=5Frelation?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2(=E9=A6=96=E6=AC=A1=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91Id=E4=BB=A5=E5=8F=8A[=E9=9D=9E=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1]=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/GridLatestServiceImpl.java  | 10 +++++-----
 .../src/main/resources/mapper/GridLatestDao.xml    | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index 051666a7cc..46bd30dfff 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -190,12 +190,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      **/
     @Override
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
-
-        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
         List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
-        if(null == userIds || userIds.isEmpty()){
-            return allData;
-        }
+        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
+        if(null == userIds) userIds = new LinkedList<>();
         CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO();
         customerParam.setCustomerId(customerUserFormDTO.getCustomerId());
         Result<List<String>> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam);
@@ -203,6 +200,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
             userIds.addAll(volunteer.getData());
             userIds = userIds.stream().distinct().collect(Collectors.toList());
         }
+        if(null == userIds || userIds.isEmpty()){
+            return allData;
+        }
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
         allData = userWechatDao.selectResiAndStrangerInfo(userIds,customerUserFormDTO.getName());
         if(null == allData || allData.isEmpty()){
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
index a649f1b540..52887827e6 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml
@@ -85,13 +85,13 @@
 
     <!-- 查询一个客户下的居民和陌生人 传参 : 客户Id -->
     <select id="selectAllUserByCustomerId" resultType="string">
-        SELECT
-            *
-        FROM
-            USER_CUSTOMER
-        WHERE
-            DEL_FLAG = '0'
-            AND IS_REGISTER = '1'
+       SELECT
+		USER_ID
+		FROM
+			REGISTER_RELATION
+		WHERE
+			DEL_FLAG ='0'
+			AND REGISTER = '1'
             AND CUSTOMER_ID = #{customerId}
     </select>