Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -505,7 +505,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		List<String> failedReason = new ArrayList<>();
 		if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()&& !("null").equals(fromDTO.getAutoId())) {
 			PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId());
-			resultDTO.setCertifyTime(autoEntity.getContrastTime().getTime());
+			resultDTO.setCertifyTime(autoEntity.getCreatedTime().getTime());
 			if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) {
 				failedReason.add("手机号匹配");
 			} else {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -125,9 +125,13 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         List<UserOperListResultDTO> userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId());
         Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId());
         if (null == userBadge){
-            return new ArrayList<>();
+            this.reloadCustomerBadge(userOperListFormDTO.getCustomerId());
+            userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId());
         }
         List<UserOperListResultDTO> userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class);
+        if(CollectionUtils.isEmpty(userOperListResultDTOS)){
+            return new ArrayList<>();
+        }
         // 没有任何记录
         if (CollectionUtils.isEmpty(userAuthBadgeList)){
             userOperListResultDTOS.forEach(u -> {