徽章列表

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

@@ -64,6 +64,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 Map<String, List<UserBadgeListResultDTO>> groupByCustomer = userBadgeListResultDTOS.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getCustomerId));
                 resultUserBadge.addAll(groupByCustomer.get(BadgeConstant.DEFAULT_CUSTOMER));
                 List<UserBadgeListResultDTO> badgeByCustomer = groupByCustomer.get(userBadgeListFormDTO.getCustomerId());
+                if (!CollectionUtils.isEmpty(badgeByCustomer)) {
                     resultUserBadge.forEach(r -> {
                         badgeByCustomer.forEach(b -> {
                             if (r.getBadgeId().equals(b.getBadgeId())) {
@@ -73,6 +74,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                     });
                     userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId());
                     userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
+                }else {
+                    userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId());
+                    userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId());
+                }
             }
         }
         List<UserBadgeListResultDTO> redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class);