From d698714e61e1b322ef12d65a52089ceff8a63703 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期二, 20 九月 2022 16:58:00 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
index cb0f377..fd38262 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -68,10 +68,14 @@
         List<ComActDynVO> records = iPage.getRecords();
         if (!ObjectUtils.isEmpty(records)) {
             records.forEach(comActDynVO1 -> {
-                String content = comActDynVO1.getContent();
-                if (!ObjectUtils.isEmpty(content)) {
-                    String text = RichTextUtil.getText(content);
-                    comActDynVO1.setContentText(text);
+                if(comActDynVO1.getCategory()!=null&&comActDynVO1.getCategory()==4){
+                    comActDynVO.setContent(null);
+                }else {
+                    String content = comActDynVO1.getContent();
+                    if (!ObjectUtils.isEmpty(content)) {
+                        String text = RichTextUtil.getText(content);
+                        comActDynVO1.setContentText(text);
+                    }
                 }
             });
         }

--
Gitblit v1.7.1