diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java index 7fd83134..99d4b904 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/user/UserToggleBadgeCmdExe.java @@ -44,11 +44,11 @@ public class UserToggleBadgeCmdExe { // 查询当前已佩戴的徽章 - List currentWearBadges = badgeBackpackService.listUseNotExpireTimeByUserIds(new HashSet<>(Collections.singletonList(userId))); + List currentWearBadges = badgeBackpackService.listNotExpireTimeByUserIds(new HashSet<>(Collections.singletonList(userId))); // 检查目标徽章是否已佩戴 boolean isWearing = currentWearBadges.stream() - .anyMatch(badge -> badge.getBadgeId().equals(badgeId)); + .anyMatch(badge -> badge.getBadgeId().equals(badgeId) && Boolean.TRUE.equals(badge.getUseProps())); List newBadgeIds; if (isWearing) {