Browse Source

Merge remote-tracking branch 'remotes/origin/dev_voice' into dev

dev_shibei_match
jianjun 5 years ago
parent
commit
88452c6442
  1. 1
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
  2. 4
      epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

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

@ -881,6 +881,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
ArticleEntity article = ConvertUtils.sourceToTarget(draft,ArticleEntity.class);
article.setId(null);
article.setDraftId(draftId);
article.setStatusFlag(DraftConstant.PUBLISHED);
baseDao.insert(article);
if(null != draftContents && draftContents.size() > NumConstant.ZERO){
draftContents.forEach(content -> {

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

@ -114,13 +114,15 @@
apr.GRID_ID = #{gridId}
</foreach>
) t
WHERE
1 = 1
<if test="tagIdList !=null and tagIdList.size() > 0">
<foreach collection="tagIdList" item="tagId" separator=" ">
AND EXISTS(
SELECT 1
FROM ARTICLE_TAGS
WHERE DEL_FLAG = '0'
AND ARTICLE_ID = a.ID
AND ARTICLE_ID = t.articleId
AND TAG_ID=#{tagId}
)
</foreach>

Loading…
Cancel
Save