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

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;
 }

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);
                 });
             }