From a7999b0e518e98e0b81f9beda17f35f2804d00ef Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 28 Aug 2023 10:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java | 3 ++- .../com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java index e3c3cdc..ce87d4f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java @@ -73,7 +73,8 @@ public class GovProjectCollectionManage { public List dictionary(String type) { List dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class) - .eq(StringUtils.isNotBlank(type), GovProjectDictionary::getType, type)); + .eq(StringUtils.isNotBlank(type), GovProjectDictionary::getType, type) + .eq(GovProjectDictionary::getDeleted,Boolean.FALSE)); if(CollUtil.isEmpty(dictionaries)){ return Collections.emptyList(); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java index eeeacde..121a7b5 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java @@ -43,4 +43,7 @@ public class GovProjectDictionary implements Serializable { @ApiModelProperty("备注") private String remark; + + @ApiModelProperty("是否删除") + private Boolean deleted; }