Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

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;
+
 }

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

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