Merge remote-tracking branch 'origin/dev'

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

@@ -153,7 +153,6 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public void initPartyMemberBadge(String userId,TokenDto tokenDto){
-        log.info("开始初始化【"+userId+"】党员徽章");
         List<UserIdAndBadgeIdResultDTO> userIds = resiUserBadgeDao.selectUserIds();
         List<ResiUserBadgeDTO> badges = new ArrayList<>();
         String partyBadgeId = badgeDao.getPartyBadgeId(null);
@@ -200,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);
                     }
                 });