From 8be4ecfaf24200219875f7c5c41e5a025537d2e0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 2 Mar 2023 14:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89agencyName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/TagScopeDTO.java             | 5 -----
 .../src/main/java/com/epmet/entity/TagScopeEntity.java       | 4 ----
 .../java/com/epmet/service/impl/TagCustomerServiceImpl.java  | 2 --
 .../src/main/resources/db/migration/V0.0.13__tag_scope.sql   | 1 -
 .../src/main/resources/mapper/TagScopeDao.xml                | 4 +---
 5 files changed, 1 insertion(+), 15 deletions(-)

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 a4e5052273..e5bf3d021a 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
@@ -24,10 +24,5 @@ public class TagScopeDTO implements Serializable {
      * agency_id全路径，包含自身
      */
     private String orgIdPath;
-
-    /**
-     * 组织名称
-     */
-    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 6747b64835..7e00ef4919 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
@@ -38,8 +38,4 @@ public class TagScopeEntity extends BaseEpmetEntity {
 	 */
 	private String orgIdPath;
 
-	/**
-	 * 组织名称
-	 */
-	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 7c1befb4f2..cad48f6eeb 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
@@ -105,7 +105,6 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeEntity.setCustomerId(entity.getCustomerId());
                 tagScopeEntity.setTagId(entity.getId());
                 tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId());
-                tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName());
                 tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath());
                 tagScopeDao.insert(tagScopeEntity);
             });
@@ -137,7 +136,6 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeEntity.setCustomerId(entity.getCustomerId());
                 tagScopeEntity.setTagId(entity.getId());
                 tagScopeEntity.setAgencyId(tagScopeDTO.getAgencyId());
-                tagScopeEntity.setAgencyName(tagScopeDTO.getAgencyName());
                 tagScopeEntity.setOrgIdPath(tagScopeDTO.getOrgIdPath());
                 tagScopeDao.insert(tagScopeEntity);
             });
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql
index 4eb48152f6..bb41f4af36 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.13__tag_scope.sql
@@ -6,7 +6,6 @@ CREATE TABLE `tag_scope` (
                              `TAG_ID` varchar(64) NOT NULL COMMENT '标签ID',
                              `AGENCY_ID` varchar(64) NOT NULL COMMENT '应用范围，这里只能是社区id',
                              `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'agency_id全路径，包含自身',
-                             `AGENCY_NAME` varchar(255) NOT NULL COMMENT '组织名称',
                              `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
                              `REVISION` int(11) NOT NULL COMMENT '乐观锁',
                              `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml
index 1da2fc6eca..3d132f74c5 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagScopeDao.xml
@@ -9,7 +9,6 @@
         <result property="tagId" column="TAG_ID"/>
         <result property="agencyId" column="AGENCY_ID"/>
         <result property="orgIdPath" column="ORG_ID_PATH"/>
-        <result property="agencyName" column="AGENCY_NAME"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -27,8 +26,7 @@
     <select id="selectScope" parameterType="java.lang.String" resultType="com.epmet.dto.TagScopeDTO">
         select ts.TAG_ID,
                ts.AGENCY_ID,
-               ts.ORG_ID_PATH,
-               ts.AGENCY_NAME
+               ts.ORG_ID_PATH
         from tag_scope ts
         where ts.del_flag='0'
           and ts.TAG_ID=#{tagId}