Merge remote-tracking branch 'origin/dev_badge_log_20210315' into dev_temp

5 years ago · 9c9ca2e643
1 changed files with 1 additions and 1 deletions
--- 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
@ -199,7 +199,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
            if (!CollectionUtils.isEmpty(userIds)) {
                AtomicReference<Boolean> status = new AtomicReference<>(true);
                userIds.forEach(u -> {
-                    if(u.equals(userId)){
+                    if(u.getUserId().equals(userId)){
                        status.set(false);
                    }
                });