From 06180fa3c8ee17d731561b88897fa18b9f8cf228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:53:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 30e7974..0609753 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){
+ comActDynVO1.setContent(null);
+ }else {
+ String content = comActDynVO1.getContent();
+ if (!ObjectUtils.isEmpty(content)) {
+ String text = RichTextUtil.getText(content);
+ comActDynVO1.setContentText(text);
+ }
}
});
}
@@ -99,9 +103,20 @@
comActDynVO.setReadNum(count);
if (nonNull(category) && !category.equals(3)) {
ComActDO comActDO = comActDAO.selectById(comActDynDO.getCommunityId());
- comActDynVO.setCommunityName(comActDO.getName());
+ if(comActDO!=null){
+ comActDynVO.setCommunityName(comActDO.getName());
+ }
}
- return R.ok(comActDynVO);
+ if(comActDynDO.getCategory()==4){
+ if(comActDynDO.getReadNum()!=null){
+ comActDynDO.setReadNum(comActDynDO.getReadNum()+1);
+ }
+ else {
+ comActDynDO.setReadNum(1);
+ }
+ comActDynDAO.updateById(comActDynDO);
+ }
+ return R.ok();
}
/**
--
Gitblit v1.7.1