diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index 459783d713..86195a32cb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -63,7 +63,12 @@ public class WorkActController { * @Date 2020/7/21 18:32 **/ @PostMapping("publish") - public Result publishAct(@RequestBody PublishActInfoFormDTO formDTO) { + public Result publishAct(@LoginUser TokenDto tokenDto,@RequestBody PublishActInfoFormDTO formDTO) { + if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) { + formDTO.setRichTextFlag(true); + } else { + formDTO.setRichTextFlag(false); + } ValidatorUtils.validateEntity(formDTO, PublishActInfoFormDTO.AddUserShowGroup.class, PublishActInfoFormDTO.AddUserInternalGroup.class); for (PublishActContentFormDTO actContentFormDTO : formDTO.getActContent()) { ValidatorUtils.validateEntity(actContentFormDTO, @@ -271,7 +276,12 @@ public class WorkActController { * @Date 2020/7/27 13:55 **/ @PostMapping("republish") - public Result rePublish(@RequestBody RePublishFormDTO rePublishFormDTO) { + public Result rePublish(@LoginUser TokenDto tokenDto,@RequestBody RePublishFormDTO rePublishFormDTO) { + if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) { + rePublishFormDTO.setRichTextFlag(true); + } else { + rePublishFormDTO.setRichTextFlag(false); + } ValidatorUtils.validateEntity(rePublishFormDTO, RePublishFormDTO.AddUserShowGroup.class, RePublishFormDTO.AddUserInternalGroup.class); for (PublishActContentFormDTO actContentFormDTO : rePublishFormDTO.getActContent()) { ValidatorUtils.validateEntity(actContentFormDTO, diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 4816d705e8..37b56f1443 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -310,6 +310,10 @@ public class WorkActServiceImpl implements WorkActService { * @Date 2020/7/21 19:20 **/ private void auditAct(PublishActInfoFormDTO formDTO) { + if(formDTO.getRichTextFlag()){ + // true:富文本;false: 原来小程序那种发布内容 + return; + } //1、活动标题 if (StringUtils.isNotBlank(formDTO.getTitle())) { this.auditActTitle(formDTO.getTitle()); @@ -347,6 +351,9 @@ public class WorkActServiceImpl implements WorkActService { * @Date 2020/7/27 14:01 **/ private void auditRePublishAct(RePublishFormDTO formDTO) { + if(formDTO.getRichTextFlag()){ + return; + } //1、活动标题 if (StringUtils.isNotBlank(formDTO.getTitle())) { this.auditActTitle(formDTO.getTitle()); @@ -1352,7 +1359,11 @@ public class WorkActServiceImpl implements WorkActService { imgList.add(actContent.getContent()); } } - this.auditActContent(textList,imgList); + // + if(!actInfoDTO.getRichTextFlag()){ + //不是富文本的走审核 + this.auditActContent(textList,imgList); + } //插入act_summary记录 int orderNum=1; for(PublishActContentFormDTO actContentFormDTO:formDTO.getActSummary()){