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

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<ArticleContentEntity> {
      * @return
      */
     ArticleContentEntity selectByArticleId(String articleId);
+
+    /**
+     *  如果是工作端小程序发布的文章，在pc编辑后，img和text删除。
+     * @param articleId
+     * @param updatedBy
+     * @return
+     */
+    int updateWxMpContent(@Param("articleId") String articleId, @Param("updatedBy")String updatedBy);
 }

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<ArticleDao, ArticleEntit
 			}
 		}
 		//内容类型 图片：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);
+		articleContentDao.updateWxMpContent(formDTO.getArticleId(),EpmetRequestHolder.getLoginUserId());
 
 		// 3.操作记录
 		ArticleOperateRecordEntity articleOperateRecord = new ArticleOperateRecordEntity();

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

@@ -15,4 +15,13 @@
           and ac.CONTENT_TYPE ='rich_text'
     </select>
 
-</mapper>
+    <update id="updateWxMpContent" parameterType="map">
+        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'
+    </update>
+</mapper>