Merge remote-tracking branch 'origin/dev_staff_info' into develop

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java

@@ -156,8 +156,8 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
             userMessageEntity.setApp(AppClientConstant.APP_GOV);
             userMessageEntity.setTitle(UserMessageConstans.INFO_TITLE);
             userMessageEntity.setMessageContent(String.format(UserMessageConstans.INFO_CONTENT_TEMP,
-                    infoEntity.getContent().length() >= NumConstant.FIFTY ?
-                    StringUtils.substring(infoEntity.getContent(), NumConstant.FORTY_NINE) : infoEntity.getContent()));
+                    infoEntity.getContent().length() > NumConstant.FIFTY ?
+                    StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent()));
             userMessageEntity.setReadFlag(UserMessageConstans.UNREAD);
             userMessageEntity.setMessageType(UserMessageConstans.MESSAGE_TYPE_INFO);
             userMessageEntity.setTargetId(infoEntity.getId());
@@ -170,7 +170,7 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
         InfoProfileEntity infoProfileEntity=new InfoProfileEntity();
         infoProfileEntity.setCustomerId(formDTO.getCustomerId());
         infoProfileEntity.setInfoId(infoEntity.getId());
-        infoProfileEntity.setContent(infoEntity.getContent().length() >= NumConstant.FIFTY ? StringUtils.substring(infoEntity.getContent(), NumConstant.FORTY_NINE) : infoEntity.getContent());
+        infoProfileEntity.setContent(infoEntity.getContent().length() > NumConstant.ONE_HUNDRED ? StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.NINETY_NINE) : infoEntity.getContent());
         infoProfileEntity.setPublishStaffId(formDTO.getUserId());
         infoProfileEntity.setTotalReceiver(totalReceiver.size());
         infoProfileEntity.setFirstAttId(firstAttId);