diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java index 73c82eaa00..315bf66a30 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java @@ -6,7 +6,7 @@ package com.epmet.constant; */ public interface BadgeConstant { - String BADGE_KEY = "epmet:badge:"; + String BADGE_KEY = "epmet:badge:customer:"; String BADGE = "badge"; 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 436898cc61..1b4e6a0c78 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 @@ -34,6 +34,7 @@ AND b.DEL_FLAG = 0 AND ub.CERTIFICATION_AUTID_STATUS = 'pass' AND b.CUSTOMER_ID = 'default' + AND b.BADGE_STATUS = 'online' AND ub.USER_ID = #{userId} ORDER BY ub.UPDATED_TIME DESC @@ -49,7 +50,8 @@ FROM badge WHERE DEL_FLAG = '0' - AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = 'zxc') + AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = #{customerId}) + AND BADGE_STATUS = 'online'