From 00623752b609420f84bd67ec9568645ce8441a11 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Mar 2023 15:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=92=8C=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0agencyNam?=
 =?UTF-8?q?e,pid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/TagScopeDTO.java         | 9 +++++++++
 .../src/main/java/com/epmet/entity/TagScopeEntity.java   | 9 ++++++++-
 .../com/epmet/service/impl/TagCustomerServiceImpl.java   | 4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java
index 8eacc3441e..bda0ab9c9b 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/TagScopeDTO.java
@@ -30,5 +30,14 @@ public class TagScopeDTO implements Serializable {
      */
     @NotBlank(message = "orgIdPath不能为空",groups = AddUserShowGroup.class)
     private String orgIdPath;
+
+    /**
+     * agencyId的直属上级
+     */
+    private String pid;
+    /**
+     * 社区名称
+     */
+    private String agencyName;
 }
 
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java
index 7e00ef4919..309d677c3b 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/TagScopeEntity.java
@@ -37,5 +37,12 @@ public class TagScopeEntity extends BaseEpmetEntity {
 	 * agency_id全路径，包含自身
 	 */
 	private String orgIdPath;
-
+	/**
+	 * agencyId的直属上级
+	 */
+	private String pid;
+	/**
+	 * 社区名称
+	 */
+	private String agencyName;
 }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
index dd37b13abf..1f1da57623 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
@@ -123,6 +123,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeEntity.setTagId(entity.getId());
                 tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId());
                 tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath());
+                tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName());
+                tagScopeEntity.setPid(tagScopeDTO.getPid());
                 tagScopeDao.insert(tagScopeEntity);
             });
         }
@@ -156,6 +158,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeEntity.setTagId(entity.getId());
                 tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId());
                 tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath());
+                tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName());
+                tagScopeEntity.setPid(tagScopeDTO.getPid());
                 tagScopeDao.insert(tagScopeEntity);
             });
         }