From 8ead47489b73044cb533a2b79b5e149b6299d3a5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Jul 2021 15:14:19 +0800
Subject: [PATCH] tagColor

---
 .../src/main/java/com/epmet/dto/SpecialSubjectDTO.java       | 5 +++++
 .../com/epmet/service/impl/SpecialSubjectServiceImpl.java    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java
index 73e91072f0..a943ed22af 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/SpecialSubjectDTO.java
@@ -107,4 +107,9 @@ public class SpecialSubjectDTO implements Serializable {
 	 * 标签名
 	 */
     private String tagName;
+
+	/**
+	 * 扩展属性：标签颜色
+	 */
+    private String tagColor;
 }
\ No newline at end of file
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 0ff3c6fe27..c8acefc253 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
@@ -210,6 +210,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
             result.setCanDel(true);
             result.setAddOrgId(dto.getAddOrgId());
             result.setOrgLevel(dto.getOrgLevel());
+            result.setTagColor(dto.getTagColor());
             currentOrgList.add(result);
         });
         if (CollectionUtils.isNotEmpty(currentOrgList)) {
@@ -232,6 +233,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
                     result.setCanDel(false);
                     result.setAddOrgId(dto.getAddOrgId());
                     result.setOrgLevel(dto.getOrgLevel());
+                    result.setTagColor(dto.getTagColor());
                     resultDTOList.add(result);
                 });
             }