From b72ea48415567594043150c1ba29a0bda1199b30 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 26 Mar 2021 13:29:30 +0800
Subject: [PATCH] =?UTF-8?q?isDisable=20=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/IssueTagFormDTO.java      | 2 ++
 .../main/java/com/epmet/service/impl/IssueTagsServiceImpl.java | 3 +++
 .../src/main/resources/mapper/IssueTagsDao.xml                 | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
index 3b9cfedb13..f67bbe2c34 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueTagFormDTO.java
@@ -21,4 +21,6 @@ public class IssueTagFormDTO implements Serializable {
 
     private String tagId;
 
+    private String isDisable;
+
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
index af19d3c033..1a55271ca7 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java
@@ -188,6 +188,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
                     issueCategoryTagResultDTO.setName(t.getName());
                     issueCategoryTagResultDTO.setId(t.getId());
+                    issueCategoryTagResultDTO.setIsDisable(t.getIsDisable());
                     dictRedis.editTagUseCount(customerId,t.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
                 // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
@@ -209,6 +210,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
                     issueCategoryTagResultDTO.setName(d.getName());
                     issueCategoryTagResultDTO.setId(d.getId());
+                    issueCategoryTagResultDTO.setIsDisable(d.getIsDisable());
                     dictRedis.editTagUseCount(customerId,d.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ONE_STR);
                 });
                 // 数据库有关标签使用次数 -1  0:+1 ; 1:-1;
@@ -222,6 +224,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
                     IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
                     issueCategoryTagResultDTO.setName(a.getName());
                     issueCategoryTagResultDTO.setId(a.getId());
+                    issueCategoryTagResultDTO.setIsDisable(a.getIsDisable());
                     dictRedis.editTagUseCount(customerId,a.getCategoryId(),issueCategoryTagResultDTO,NumConstant.ZERO_STR);
                 });
                 // 数据库对应标签 议题使用次数 +1
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
index 5f134b85a3..064a02b31e 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueTagsDao.xml
@@ -44,7 +44,8 @@
             it.TAG_ID AS id,
             it.TAG_NAME as name,
             td.CATEGORY_ID,
-            it.TAG_ID AS tagId
+            it.TAG_ID AS tagId,
+            td.IS_DISABLE
         FROM issue_tags it
         LEFT JOIN issue_project_tag_dict td ON td.id = it.TAG_ID
         WHERE it.DEL_FLAG = 0