From b7e03649adc49c855b40dbcf97699203dfa937b5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Apr 2023 17:03:16 +0800 Subject: [PATCH 1/2] fix --- .../main/java/com/epmet/service/impl/ArticleServiceImpl.java | 5 +++-- .../src/main/resources/mapper/ArticleContentDao.xml | 2 +- 2 files changed, 4 insertions(+), 3 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 37bcb6077b..cb3524b70f 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 @@ -1824,6 +1824,7 @@ public class ArticleServiceImpl extends BaseServiceImpl contentEntityList = articleContentDao.selectList(tWrapper1); + resultDTO.setContentList(new ArrayList<>()); if (!CollectionUtils.isEmpty(contentEntityList)) { List contentList = ConvertUtils.sourceToTarget(contentEntityList, PublishedListResultDTO.Content.class); resultDTO.setContentList(contentList); @@ -1938,10 +1939,10 @@ public class ArticleServiceImpl extends BaseServiceImpl 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()){ diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml index 6949d87a1d..9614ff32fa 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml +++ b/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' From 633d3915856dec976a1159c166247b731330b3c6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Apr 2023 17:27:14 +0800 Subject: [PATCH 2/2] fix --- .../src/main/java/com/epmet/dto/form/AddOrSaveDraftFormDTO.java | 1 - .../src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java | 1 - .../src/main/java/com/epmet/service/impl/ArticleServiceImpl.java | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddOrSaveDraftFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddOrSaveDraftFormDTO.java index aef08ba3ff..1433f2f1b6 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddOrSaveDraftFormDTO.java +++ b/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; } diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java index 9c01032aff..4c1a305203 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/UpdateArticleFormDTO.java +++ b/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; } 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 cb3524b70f..fbdb18f5ed 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 @@ -1829,6 +1829,7 @@ public class ArticleServiceImpl extends BaseServiceImpl contentList = ConvertUtils.sourceToTarget(contentEntityList, PublishedListResultDTO.Content.class); resultDTO.setContentList(contentList); } + // 附件列表 LambdaQueryWrapper fileWrapper = new LambdaQueryWrapper<>(); fileWrapper.eq(ArticleContentEntity::getArticleId, formDTO.getArticleId()); fileWrapper.eq(ArticleContentEntity::getDelFlag, NumConstant.ZERO_STR);