From abcaf53241cf1b5c25a22d0d8703760ca98148dc Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 24 Nov 2020 16:07:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/UserBadgeServiceImpl.java | 3 ++-
 .../epmet-user-server/src/main/resources/mapper/BadgeDao.xml   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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 4c6ed8a383..e0995a2d34 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
@@ -276,7 +276,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
 
         //TODO 站内信发送
         String badgeName = badgeDao.selectBadgeName(form.getCustomerId(), form.getBadgeId());
-        sendMessage(BadgeConstant.AUTH_TITLE,String.format(BadgeConstant.MESSAGE_CONTENT,userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict().concat(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName()),badgeName),form.getGridId(),form.getUserId(),form.getCustomerId());
+        String msg = String.format(BadgeConstant.MESSAGE_CONTENT, userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict().concat(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName()), badgeName);
+        sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId());
 
         return new Result();
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
index db53fcc094..c9be676412 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml
@@ -306,6 +306,7 @@
         FROM badge
         WHERE DEL_FLAG = 0
             AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = #{customerId})
+            AND ID = #{badgeId}
         ORDER BY CREATED_TIME DESC
         LIMIT 1
     </select>

From 74ef1a6290dcf9a78d4fe34b33a153588d7784ab Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 24 Nov 2020 16:10:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/constant/BadgeConstant.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 28c192006f..3be3ce02c3 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
@@ -36,7 +36,7 @@ public interface BadgeConstant {
 
     String GET_BADGE_NAME_FAILURE = "获取徽章名称失败......";
 
-    String MESSAGE_CONTENT = "%s申请认证%s，请审核";
+    String MESSAGE_CONTENT = "您有一条徽章认证消，,%s申请认证%s，请审核";
 
     String READ_FLAG = "unread";