diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java index 1186ff3cdb..dc92be3d6f 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddSpecialSubjectFormDTO.java @@ -26,7 +26,7 @@ public class AddSpecialSubjectFormDTO implements Serializable { /** * orgId的所有上级id */ - @NotBlank(message = "pids不能为空", groups = QuerySpecialSubFormDTO.AddUserInternalGroup.class) + @NotBlank(message = "pids不能为空", groups = AddUserInternalGroup.class) private String pids; /** diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java index 451a44c296..d82e148a93 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java @@ -32,4 +32,7 @@ public class WorkSpecialSubjectResultDTO implements Serializable { * 专题id */ private String specialSubjectId; + + private String addOrgId; + private String orgLevel; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java index 70a15d0d08..de50bc1b51 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java @@ -203,15 +203,20 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl pidList = Arrays.asList(formDTO.getPids().split(StrConstant.COLON)); for (String pid : pidList) { + if(CollectionUtils.isNotEmpty(resultDTOList)){ + List parentAddList=resultDTOList.stream().map(WorkSpecialSubjectResultDTO::getTagId).distinct().collect(Collectors.toList()); + notList.addAll(parentAddList); + } //优先展示自己的,所以要排除掉 领导们给我建立的专题 List list = baseDao.queryExistedList(pid, notList); list.forEach(dto -> { @@ -220,6 +225,8 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl - and ss.id not in - - #{id} + and ss.tag_id not in + + #{tagId} order by ss.CREATED_TIME desc