徽章

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

@@ -240,12 +240,14 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             List<UserBadgeListResultDTO> badgeByCustomer = groupByCustomer.get(customerId);
             if (!CollectionUtils.isEmpty(badgeByCustomer)) {
                 resultUserBadge.forEach(r -> {
-                    badgeByCustomer.forEach(b -> {
+                    for (int i = NumConstant.ZERO; i < badgeByCustomer.size(); i++) {
-                        if (r.getBadgeId().equals(b.getBadgeId())) {
+                        if (r.getBadgeId().equals(badgeByCustomer.get(i).getBadgeId())) {
-                            BeanUtils.copyProperties(b, r);
+                            BeanUtils.copyProperties(badgeByCustomer.get(i), r);
+                            badgeByCustomer.remove(badgeByCustomer.get(i));
                         }
-                    });
+                    }
                 });
+                resultUserBadge.addAll(badgeByCustomer);
             }
             userBadgeRedis.setCustomerBadge(resultUserBadge, customerId);
         }