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 69c804c58d..06f78776ad 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 @@ -86,7 +86,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { } redisUserBadgeList.forEach(u -> { userBadgeListResultDTOS.forEach(badge -> { - if (u.getBadgeId().equals(badge.getBadgeId())){ + if (u.getBadgeId().equals(badge.getBadgeId()) && badge.getIsOpened().equals(NumConstant.ONE)){ badge.setBadgeIcon(u.getBadgeIcon()); u.setStatus(true); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index b4c319c93f..d90c6aa70b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -35,7 +35,6 @@ AND b.DEL_FLAG = 0 AND ub.CERTIFICATION_AUTID_STATUS = 'approved' AND b.CUSTOMER_ID = 'default' - AND ub.IS_OPENED = 1 AND b.BADGE_STATUS = 'online' AND ub.USER_ID = #{userId} ORDER BY ub.UPDATED_TIME DESC