diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java index 74d74fb..aa6e63c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java @@ -19,6 +19,15 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery private String keyword; + private Integer enable; + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } public MongoQuery convertToQuery() { // MongoCondition condition = MongoCondition.newInstance("1","1",MongoOper.IS); @@ -36,6 +45,9 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } + if(null!=enable){ + condition = condition.and("enable", enable, MongoOper.IS); + } if (null != keyword) { MongoCondition con1= MongoCondition.newInstance("code", keyword, MongoOper.LIKE); MongoCondition con = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java index c09a5c1..58dea90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java @@ -92,7 +92,7 @@ public class RegionController extends BaseController{ parentId = SystemConfig.CHINA_BASIC_ID; query.setParentId(parentId); } - + query.setEnable(1); List configList = basicConfigService.queryBasicConfig(query); List> list =new ArrayList>();