Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

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

@@ -279,7 +279,8 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         userBadgeDao.insertUserBadgeCertificateRecord(form);
         //TODO 站内信发送
         String badgeName = badgeDao.selectBadgeName(form.getCustomerId(), form.getBadgeId());
-        String msg = String.format(BadgeConstant.MESSAGE_CONTENT, userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict().concat(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName()), badgeName);
+        String s = StringUtils.isBlank(userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict()) ? userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName() : userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict().concat(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName());
+        String msg = String.format(BadgeConstant.MESSAGE_CONTENT, s, badgeName);
         // 记录待审核id，和消息类型
         sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId(),
                 UserMessageTypeConstant.BADGE_AUTH_APPLY,