Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

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 -> {