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

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

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

@@ -157,7 +157,7 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
             userMessageEntity.setTitle(UserMessageConstans.INFO_TITLE);
             userMessageEntity.setMessageContent(String.format(UserMessageConstans.INFO_CONTENT_TEMP,
                     infoEntity.getContent().length() > NumConstant.FIFTY ?
-                    StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent()));
+                            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());
@@ -237,14 +237,14 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
         infoReplyDao.insert(infoReplyEntity);
         int sort=1;
         if(StringUtils.isNotBlank(formDTO.getContent())){
-           InfoReplyContentEntity contentEntity=new  InfoReplyContentEntity();
-           contentEntity.setCustomerId(formDTO.getCustomerId());
-           contentEntity.setInfoReplyId(infoReplyEntity.getId());
-           contentEntity.setReplyType("text");
-           contentEntity.setContent(formDTO.getContent());
-           contentEntity.setSort(sort);
-           infoReplyContentDao.insert(contentEntity);
-           sort++;
+            InfoReplyContentEntity contentEntity=new  InfoReplyContentEntity();
+            contentEntity.setCustomerId(formDTO.getCustomerId());
+            contentEntity.setInfoReplyId(infoReplyEntity.getId());
+            contentEntity.setReplyType("text");
+            contentEntity.setContent(formDTO.getContent());
+            contentEntity.setSort(sort);
+            infoReplyContentDao.insert(contentEntity);
+            sort++;
         }
         if(CollectionUtils.isNotEmpty(formDTO.getAttachmentList())){
             for(FileCommonDTO att:formDTO.getAttachmentList()) {
@@ -358,7 +358,7 @@ public class InfoServiceImpl extends BaseServiceImpl<InfoDao, InfoEntity> implem
         orgStaffFormDTO.setCustomerId(customerId);
         for(OrgCommonDTO org:orgList){
             if(OrgTypeEnum.GRID.getCode().equals(org.getOrgType())){
-            orgStaffFormDTO.getGridIds().add(org.getOrgId());
+                orgStaffFormDTO.getGridIds().add(org.getOrgId());
             }else if(OrgTypeEnum.AGENCY.getCode().equals(org.getOrgType())){
                 orgStaffFormDTO.getAgencyIds().add(org.getOrgId());
             }else if(OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())){