From 77c055ec7c83a38c49909f031c394c857bc40a2e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 9 Mar 2023 14:24:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E3=80=81=E5=85=9A=E5=BB=BA=E5=AE=A3=E4=BC=A0=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=8F=AA=E5=B1=95=E7=A4=BAshow=5Ffl?=
 =?UTF-8?q?ag=3D'1'=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/TagCustomerDao.xml                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml
index 8d10cda3fa..1f584ac33f 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml
@@ -89,6 +89,7 @@
             ts.CUSTOMER_ID = #{customerId}
           AND tc.CUSTOMER_ID
           AND ts.AGENCY_ID = #{agencyId}
+          and tc.SHOW_FLAG ='1'
         ORDER BY
             convert(tc.TAG_NAME USING gbk) ASC;
     </select>

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 2/2] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?agencyName,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);
             });
         }