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>