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

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";
 

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();
     }

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>