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

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

@@ -177,7 +177,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		List<DraftContentEntity> draftContentList = null;
 		if (StringUtils.isNotBlank(fromDTO.getDraftId())) {
 			draftEntity = this.checkDraftStatus(fromDTO.getDraftId());
-			draftEntity.setTitle(StringUtils.isBlank(draftEntity.getTitle()) ? "" : draftEntity.getTitle());
+			draftEntity.setTitle(StringUtils.isBlank(fromDTO.getTitle()) ? "" : fromDTO.getTitle());
 			buildPreviewContent(fromDTO, draftEntity);
 			draftDao.updateById(draftEntity);
 		} else {
@@ -378,7 +378,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 		buildName(tokenDto,agencyGridNameList,publishRangeEntityList, fromDTO, articleGridResultDTO);
 		buildAgencyGridNames(tokenDto,agencyGridNameList,publishRangeEntityList, fromDTO, articleGridResultDTO);
-		draftEntity.setPublishRangeDesc(StringUtils.join(agencyGridNameList,"|"));
+		draftEntity.setPublishRangeDesc(StringUtils.join(agencyGridNameList,"、"));
 		return publishRangeEntityList;
 	}
 

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

@@ -66,7 +66,7 @@
               FROM article_tags at
               WHERE at.DEL_FLAG = '0'
               AND at.ARTICLE_ID = a.ID
-              <foreach item="tagId" collection="tagIdList" open="AND (" separator="or" close=")" index="">
+              <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
                   at.TAG_ID = #{tagId}
               </foreach>
               )
@@ -124,7 +124,7 @@
             FROM article_tags at
             WHERE at.DEL_FLAG = '0'
             AND at.ARTICLE_ID = t.articleId
-            <foreach item="tagId" collection="tagIdList" open="AND (" separator="or" close=")" index="">
+            <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
                 at.TAG_ID = #{tagId}
             </foreach>
             )