From 6768ce1fb034e1b4ed1c46fdf75e2cf0e1b088d5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 5 Jul 2022 14:55:30 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9=E4=B8=8D?=
 =?UTF-8?q?=E8=B5=B0=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/WorkActController.java    | 14 ++++++++++++--
 .../com/epmet/service/impl/WorkActServiceImpl.java | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

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<PublishActResultDTO> publishAct(@RequestBody PublishActInfoFormDTO formDTO) {
+    public Result<PublishActResultDTO> 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<PublishActResultDTO> rePublish(@RequestBody RePublishFormDTO rePublishFormDTO) {
+    public Result<PublishActResultDTO> 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()){