Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'

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

@@ -81,6 +81,9 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             this.reloadCustomerBadge(userBadgeListFormDTO.getCustomerId());
             userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
         }
+        if (null == userBadge){
+            return new ArrayList<>();
+        }
         List<UserBadgeListResultDTO> redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);
         List<UserBadgeListResultDTO> userBadgeListResultDTOS = userBadgeDao.selectBadgeList(userBadgeListFormDTO);
         if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){
@@ -116,6 +119,9 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     public List<UserOperListResultDTO> selectOperList(UserOperListFormDTO userOperListFormDTO) {
         List<UserOperListResultDTO> userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId());
         Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId());
+        if (null == userBadge){
+            return new ArrayList<>();
+        }
         List<UserOperListResultDTO> userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class);
         // 没有任何记录
         if (CollectionUtils.isEmpty(userAuthBadgeList)){