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 b2b12d5966..b4dcf4f9ba 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 @@ -1417,10 +1417,12 @@ public class ArticleServiceImpl extends BaseServiceImpl pidList = Arrays.stream(pids.split(":")).collect(Collectors.toList()); pidList.add(gridId); List result = baseDao.subjectList(pidList); - if (!CollectionUtils.isEmpty(result)){ - return result; + if (CollectionUtils.isEmpty(result)){ + return new ArrayList<>(); } - return new ArrayList<>(); + List tags = result.stream().map(SubjectListResultDTO::getTagId).distinct().collect(Collectors.toList()); + result = result.stream().filter(item -> !tags.contains(item.getTagId())).collect(Collectors.toList()); + return result; } /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index a0e7025239..732bf2683a 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -386,10 +386,11 @@ ss.ADD_ORG_ID = #{pid} ) - order by + order by field( + ss.ADD_ORG_ID, #{pid} - + ) ,ss.CREATED_TIME DESC