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