Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -1417,10 +1417,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		List<String> pidList = Arrays.stream(pids.split(":")).collect(Collectors.toList());
 		pidList.add(gridId);
 		List<SubjectListResultDTO> result = baseDao.subjectList(pidList);
-		if (!CollectionUtils.isEmpty(result)){
-			return result;
+		if (CollectionUtils.isEmpty(result)){
+			return new ArrayList<>();
 		}
-		return new ArrayList<>();
+		List<String> tags = result.stream().map(SubjectListResultDTO::getTagId).distinct().collect(Collectors.toList());
+		result = result.stream().filter(item -> !tags.contains(item.getTagId())).collect(Collectors.toList());
+		return result;
 	}
 
 	/**

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

@@ -386,10 +386,11 @@
                   ss.ADD_ORG_ID = #{pid}
               </foreach>
             )
-        order by
+        order by field(
+        ss.ADD_ORG_ID,
         <foreach collection="pidList" item="pid" separator=" , ">
             #{pid}
-        </foreach>
+        </foreach>)
         ,ss.CREATED_TIME DESC
     </select>
     <select id="selectArticleListByTag" resultType="com.epmet.dto.result.ArticleListResultDTO">