jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 13 additions and 1 deletions

...	...	@@ -19,7 +19,16 @@
19	19
20	20	private String keyword;
21	21
	22	+ private Integer enable;
22	23
	24	+ public Integer getEnable() {
	25	+ return enable;
	26	+ }
	27	+
	28	+ public void setEnable(Integer enable) {
	29	+ this.enable = enable;
	30	+ }
	31	+
23	32	public MongoQuery convertToQuery() {
24	33	// MongoCondition condition = MongoCondition.newInstance("1","1",MongoOper.IS);
25	34	MongoCondition condition = MongoCondition.newInstance("yn", YnEnums.YES.getId(),MongoOper.IS);
...	...	@@ -35,6 +44,9 @@
35	44	}
36	45	if (null != parentId) {
37	46	condition = condition.and("parentId", parentId, MongoOper.IS);
	47	+ }
	48	+ if(null!=enable){
	49	+ condition = condition.and("enable", enable, MongoOper.IS);
38	50	}
39	51	if (null != keyword) {
40	52	MongoCondition con1= MongoCondition.newInstance("code", keyword, MongoOper.LIKE);

...	...	@@ -92,7 +92,7 @@
92	92	parentId = SystemConfig.CHINA_BASIC_ID;
93	93	query.setParentId(parentId);
94	94	}
95		-
	95	+ query.setEnable(1);
96	96
97	97	List<BasicConfig> configList = basicConfigService.queryBasicConfig(query);
98	98	List<Map<String,Object>> list =new ArrayList<Map<String, Object>>();