积分调整人员列表查询，将从user_customer查询(首次注册居民Id以及[非首次]注册居民Id)改成从register_relation查询(首次注册居民Id以及[非首次]注册居民Id)

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()){
+        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
-            return allData;
+        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()){

epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml

@@ -86,12 +86,12 @@
     <!-- 查询一个客户下的居民和陌生人 传参 : 客户Id -->
     <select id="selectAllUserByCustomerId" resultType="string">
        SELECT
-            *
+		USER_ID
 		FROM
-            USER_CUSTOMER
+			REGISTER_RELATION
 		WHERE
-            DEL_FLAG = '0'
+			DEL_FLAG ='0'
-            AND IS_REGISTER = '1'
+			AND REGISTER = '1'
             AND CUSTOMER_ID = #{customerId}
     </select>