From ea90b26e2b792c0a30c0b55b4d6c7bdcceb62f48 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Jul 2021 10:36:27 +0800
Subject: [PATCH] commit3

---
 .../com/epmet/dto/form/AddSpecialSubjectFormDTO.java  |  2 +-
 .../epmet/dto/result/WorkSpecialSubjectResultDTO.java |  3 +++
 .../epmet/service/impl/SpecialSubjectServiceImpl.java | 11 +++++++++--
 .../src/main/resources/mapper/SpecialSubjectDao.xml   |  6 +++---
 4 files changed, 16 insertions(+), 6 deletions(-)

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<SpecialSubjectDao
             result.setTagId(dto.getTagId());
             result.setTagName(dto.getTagName());
             result.setCanDel(true);
+            result.setAddOrgId(dto.getAddOrgId());
+            result.setOrgLevel(dto.getOrgLevel());
             currentOrgList.add(result);
         });
         if (CollectionUtils.isNotEmpty(currentOrgList)) {
-            notList = currentOrgList.stream().map(WorkSpecialSubjectResultDTO::getSpecialSubjectId).distinct().collect(Collectors.toList());
+            notList = currentOrgList.stream().map(WorkSpecialSubjectResultDTO::getTagId).distinct().collect(Collectors.toList());
         }
         if (!NumConstant.ZERO_STR.equals(formDTO.getPids())) {
-            //存在上级组织...,从上往下查
             List<String> pidList = Arrays.asList(formDTO.getPids().split(StrConstant.COLON));
             for (String pid : pidList) {
+                if(CollectionUtils.isNotEmpty(resultDTOList)){
+                    List<String> parentAddList=resultDTOList.stream().map(WorkSpecialSubjectResultDTO::getTagId).distinct().collect(Collectors.toList());
+                    notList.addAll(parentAddList);
+                }
                 //优先展示自己的，所以要排除掉 领导们给我建立的专题
                 List<SpecialSubjectDTO> list = baseDao.queryExistedList(pid, notList);
                 list.forEach(dto -> {
@@ -220,6 +225,8 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
                     result.setTagId(dto.getTagId());
                     result.setTagName(dto.getTagName());
                     result.setCanDel(false);
+                    result.setAddOrgId(dto.getAddOrgId());
+                    result.setOrgLevel(dto.getOrgLevel());
                     resultDTOList.add(result);
                 });
             }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml
index d3e7c4b40d..d78a75baea 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml
@@ -20,9 +20,9 @@
             AND tc.DEL_FLAG = '0'
             AND ss.ADD_ORG_ID = #{orgId}
             <if test="null != notList and notList.size()>0">
-                and ss.id not in
-                <foreach item="id" collection="notList" open="(" separator="," close=")">
-                    #{id}
+                and ss.tag_id not in
+                <foreach item="tagId" collection="notList" open="(" separator="," close=")">
+                    #{tagId}
                 </foreach>
             </if>
             order by ss.CREATED_TIME desc