From dd5e5b9c17e66998698fb26a6901407b99a2d789 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 27 Jul 2021 13:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=9C=89=E4=B8=93=E9=A2=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/WorkSpecialSubjectResultDTO.java  | 7 +++++++
 .../com/epmet/service/impl/SpecialSubjectServiceImpl.java  | 2 ++
 2 files changed, 9 insertions(+)

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 8e0b2a2ba7..bd90c9c462 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
@@ -53,4 +53,11 @@ public class WorkSpecialSubjectResultDTO implements Serializable {
      * 创建人-前端无用
      */
     private String createdBy;
+
+    /**
+     * 新增此专题用户所属的组织id
+     * mean:当前人是谁？
+     * -前端无用
+     */
+    private String addUserAgencyId;
 }
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 f29d15d39e..2d53cfb350 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
@@ -231,6 +231,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
             result.setTagColor(dto.getTagColor());
             result.setCreatedTime(dto.getCreatedTime());
             result.setCreatedBy(dto.getCreatedBy());
+            result.setAddUserAgencyId(dto.getAddUserAgencyId());
             currentOrgList.add(result);
         });
         if (CollectionUtils.isNotEmpty(currentOrgList)) {
@@ -263,6 +264,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
                     result.setTagColor(dto.getTagColor());
                     result.setCreatedTime(dto.getCreatedTime());
                     result.setCreatedBy(dto.getCreatedBy());
+                    result.setAddUserAgencyId(dto.getAddUserAgencyId());
                     resultDTOList.add(result);
                 });
             }