Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddOrSaveDraftFormDTO.java

@@ -93,7 +93,6 @@ public class AddOrSaveDraftFormDTO implements Serializable {
     public static class ContentDTO {
         public ContentDTO() {
         }
-        private String fileId;
         private String content;
         private String fileName;
     }

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java

@@ -101,7 +101,6 @@ public class UpdateArticleFormDTO {
     public static class ContentDTO {
         public ContentDTO() {
         }
-        private String fileId;
         private String content;
         private String fileName;
     }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -1824,10 +1824,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		tWrapper1.ne(ArticleContentEntity::getContentType,"file");
 		tWrapper1.orderByDesc(ArticleContentEntity::getOrderNum);
 		List<ArticleContentEntity> contentEntityList = articleContentDao.selectList(tWrapper1);
+		resultDTO.setContentList(new ArrayList<>());
 		if (!CollectionUtils.isEmpty(contentEntityList)) {
 			List<PublishedListResultDTO.Content> contentList = ConvertUtils.sourceToTarget(contentEntityList, PublishedListResultDTO.Content.class);
 			resultDTO.setContentList(contentList);
 		}
+		// 附件列表
 		LambdaQueryWrapper<ArticleContentEntity> fileWrapper = new LambdaQueryWrapper<>();
 		fileWrapper.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId());
 		fileWrapper.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);
@@ -1938,10 +1940,10 @@ 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");
+					.eq(ArticleContentEntity::getContentType,"file");
 			articleContentDao.delete(del);
 			int orderNum=2;
 			for(UpdateArticleFormDTO.ContentDTO  file:formDTO.getFileList()){

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml

@@ -11,7 +11,7 @@
             article_content ac
         WHERE
             ac.DEL_FLAG = '0'
-          AND ac.ID = #{articleId}
+          AND ac.ARTICLE_ID = #{articleId}
           and ac.CONTENT_TYPE ='rich_text'
     </select>