From 09455ae033aabe584710336435429f43eeb03ad3 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 22 Mar 2021 18:01:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=A0=87=E7=AD=BE=E7=83=AD=E5=BA=A6?= =?UTF-8?q?=E7=BC=93=E5=AD=98dto=E5=8A=A0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/IssueCategoryTagResultDTO.java | 5 +++++ .../epmet/service/impl/IssueProjectTagDictServiceImpl.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java index a36724d35a..bfd9eec5f4 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueCategoryTagResultDTO.java @@ -23,7 +23,12 @@ public class IssueCategoryTagResultDTO implements Serializable { */ private String name; + /** + * 是否禁用(enable:启用 disable:禁用) + */ + private String isDisable; + //equals计算时忽略isDisable属性 @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java index 2fe298a91a..5919990477 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectTagDictServiceImpl.java @@ -170,7 +170,7 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl { String redisKey = GovIssueRedisKeys.getGovernmentTagKey(param.getCustomerId(),tag.getCategoryId()); IssueCategoryTagResultDTO cache = new IssueCategoryTagResultDTO(); - cache.setId(tag.getId());cache.setName(tag.getTagName()); + cache.setId(tag.getId());cache.setName(tag.getTagName());cache.setIsDisable(tag.getIsDisable()); if(CollectionUtils.isNotEmpty(value.get(redisKey))){ value.get(redisKey).add(cache); }else{ @@ -191,7 +191,7 @@ public class IssueProjectTagDictServiceImpl extends BaseServiceImpl { String redisKey = GovIssueRedisKeys.getGovernmentTagKey(param.getCustomerId(),tag.getCategoryId()); IssueCategoryTagResultDTO cache = new IssueCategoryTagResultDTO(); - cache.setId(tag.getId());cache.setName(tag.getTagName()); + cache.setId(tag.getId());cache.setName(tag.getTagName());cache.setIsDisable(tag.getIsDisable()); if(CollectionUtils.isNotEmpty(value.get(redisKey))){ value.get(redisKey).add(cache); }else{