From ab8638384c013769177ca1ed5cc1e76908b61d60 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 6 Nov 2020 14:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserBadgeServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index c8cf999968..32b0cef882 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -240,12 +240,14 @@ public class UserBadgeServiceImpl implements UserBadgeService { List badgeByCustomer = groupByCustomer.get(customerId); if (!CollectionUtils.isEmpty(badgeByCustomer)) { resultUserBadge.forEach(r -> { - badgeByCustomer.forEach(b -> { - if (r.getBadgeId().equals(b.getBadgeId())) { - BeanUtils.copyProperties(b, r); + for (int i = NumConstant.ZERO; i < badgeByCustomer.size(); i++) { + if (r.getBadgeId().equals(badgeByCustomer.get(i).getBadgeId())) { + BeanUtils.copyProperties(badgeByCustomer.get(i), r); + badgeByCustomer.remove(badgeByCustomer.get(i)); } - }); + } }); + resultUserBadge.addAll(badgeByCustomer); } userBadgeRedis.setCustomerBadge(resultUserBadge, customerId); }