diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java index 227fa89114..737329e96d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleContentDao.java @@ -20,6 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.ArticleContentEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 文章内容表 @@ -36,4 +37,12 @@ public interface ArticleContentDao extends BaseDao { * @return */ ArticleContentEntity selectByArticleId(String articleId); + + /** + * 如果是工作端小程序发布的文章,在pc编辑后,img和text删除。 + * @param articleId + * @param updatedBy + * @return + */ + int updateWxMpContent(@Param("articleId") String articleId, @Param("updatedBy")String updatedBy); } \ No newline at end of file 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 d2fdb3a7e8..5068acb9f1 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 @@ -1957,14 +1957,7 @@ public class ArticleServiceImpl extends BaseServiceImpl 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); + articleContentDao.updateWxMpContent(formDTO.getArticleId(),EpmetRequestHolder.getLoginUserId()); // 3.操作记录 ArticleOperateRecordEntity articleOperateRecord = new ArticleOperateRecordEntity(); 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 300b4d14bc..6949d87a1d 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 @@ -15,4 +15,13 @@ and ac.CONTENT_TYPE ='rich_text' - \ No newline at end of file + + update article_content ac + set ac.del_flag='1', + ac.UPDATED_BY=#{updatedBy}, + ac.UPDATED_TIME=now() + where ac.id = #{articleId} + and ac.CONTENT_TYPE in ('img','text') + and ac.del_flag='0' + +