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

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

@@ -195,10 +195,11 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             List<String> oneUserIds = new ArrayList<>();
             oneUserIds.add(userId);
             List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(oneUserIds);
+            log.info("user【"+userId+"】基本信息："+userBaseInfoResultDTOS.toString());
             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);
                     }
                 });
@@ -232,6 +233,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                     badges.add(dto);
                 });
             }
+            log.info("即将插入的徽章信息："+badges);
             resiUserBadgeDao.insertResiUserBadge(badges);
         }
     }