From fe0536f36b91cf52e64e36a49ec3b21d272bcd3b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 24 Apr 2023 15:41:13 +0800
Subject: [PATCH] updateArticle

---
 .../service/impl/ArticleServiceImpl.java      | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index ab7bd3a92f..fe425d7f03 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -1938,30 +1938,34 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 		// 2.1 附件
 		if(!CollectionUtils.isEmpty(formDTO.getFileList())){
+			//
+			LambdaQueryWrapper<ArticleContentEntity> del=new LambdaQueryWrapper<>();
+			del.eq(ArticleContentEntity::getArticleId,formDTO.getArticleId())
+					.ne(ArticleContentEntity::getContent,"rich_text");
+			articleContentDao.delete(del);
 			int orderNum=2;
 			for(UpdateArticleFormDTO.ContentDTO  file:formDTO.getFileList()){
-				if(StringUtils.isNotBlank(file.getFileId())){
-					LambdaUpdateWrapper<ArticleContentEntity> updateWrapper=new LambdaUpdateWrapper<>();
-					updateWrapper.set(ArticleContentEntity::getContent,file.getContent())
-							.set(ArticleContentEntity::getFileName,file.getFileName())
-							.set(ArticleContentEntity::getUpdatedBy,EpmetRequestHolder.getLoginUserId())
-							.set(ArticleContentEntity::getUpdatedTime,new Date())
-							.set(ArticleContentEntity::getOrderNum,orderNum)
-							.eq(ArticleContentEntity::getId,file.getFileId());
-					articleContentDao.update(null,updateWrapper);
-				}else{
-					ArticleContentEntity fileDto=new ArticleContentEntity();
-					fileDto.setCustomerId(formDTO.getCustomerId());
-					fileDto.setArticleId(formDTO.getArticleId());
-					fileDto.setContent(file.getContent());
-					fileDto.setFileName(file.getFileName());
-					fileDto.setContentType("file");
-					fileDto.setOrderNum(orderNum);
-					articleContentDao.insert(fileDto);
-				}
+				ArticleContentEntity fileDto=new ArticleContentEntity();
+				fileDto.setCustomerId(formDTO.getCustomerId());
+				fileDto.setArticleId(formDTO.getArticleId());
+				fileDto.setContent(file.getContent());
+				fileDto.setFileName(file.getFileName());
+				fileDto.setContentType("file");
+				fileDto.setOrderNum(orderNum);
+				articleContentDao.insert(fileDto);
 				orderNum++;
 			}
 		}
+		//内容类型 图片：img；文字：text；文件：file 富文本：rich_text 如果是工作端小程序发布的文章，在pc编辑后，img和text删除。
+		LambdaUpdateWrapper<ArticleContentEntity> updateWrapper=new LambdaUpdateWrapper<>();
+		updateWrapper.eq(ArticleContentEntity::getArticleId,formDTO.getArticleId())
+				.ne(ArticleContentEntity::getContentType,"rich_text")
+				.ne(ArticleContentEntity::getContentType,"file")
+				.set(ArticleContentEntity::getDelFlag,NumConstant.ONE_STR)
+				.set(ArticleContentEntity::getUpdatedBy,EpmetRequestHolder.getLoginUserId())
+				.set(ArticleContentEntity::getUpdatedTime,new Date());
+		articleContentDao.update(null,updateWrapper);
+
 		// 3.操作记录
 		ArticleOperateRecordEntity articleOperateRecord = new ArticleOperateRecordEntity();
 		articleOperateRecord.setCustomerId(formDTO.getCustomerId());