jiangjiazhi / regional-platform

Authored by rui.zhang over 9 years ago

Exists in master and in 8 other branches

基础配置 参考值 不能删除

Showing 2 changed files with 8 additions and 8 deletions

...	...	@@ -56,16 +56,16 @@
56	56
57	57	if (null != referVal) {
58	58	if(1 == referVal) {
59		- condition.and("charRefer", null, MongoOper.NE);
	59	+ condition.and("charRefer", "", MongoOper.NE);
60	60	} else if(2 == referVal) {
61		- condition.and("charRefer", null, MongoOper.IS);
	61	+ condition.and("charRefer", "", MongoOper.IS);
62	62	}
63	63	}
64	64	if (null != emergencyVal) {
65	65	if(1 == emergencyVal) {
66		- condition.and("emergencyChar", null, MongoOper.NE);
	66	+ condition.and("emergencyChar", "", MongoOper.NE);
67	67	} else if(2 == emergencyVal) {
68		- condition.and("emergencyChar", null, MongoOper.IS);
	68	+ condition.and("emergencyChar", "", MongoOper.IS);
69	69	}
70	70	}
71	71

...	...	@@ -40,20 +40,20 @@
40	40	referValue.setCreateDate(System.currentTimeMillis());
41	41
42	42	if(null == referValue.getCharRefer() \|\| 0 == referValue.getCharRefer().length()) {
43		- referValue.setCharRefer(null);
	43	+ referValue.setCharRefer("");
44	44	}
45	45	if(null == referValue.getEmergencyChar() \|\| 0 == referValue.getEmergencyChar().length()) {
46		- referValue.setEmergencyChar(null);
	46	+ referValue.setEmergencyChar("");
47	47	}
48	48	referConfigDao.addRefer(referValue);
49	49	}
50	50
51	51	public void updateRefer(ReferValue referValue) {
52	52	if(null == referValue.getCharRefer() \|\| 0 == referValue.getCharRefer().length()) {
53		- referValue.setCharRefer(null);
	53	+ referValue.setCharRefer("");
54	54	}
55	55	if(null == referValue.getEmergencyChar() \|\| 0 == referValue.getEmergencyChar().length()) {
56		- referValue.setEmergencyChar(null);
	56	+ referValue.setEmergencyChar("");
57	57	}
58	58	MongoCondition mongoCondition = MongoCondition.newInstance("id",referValue.getId(), MongoOper.IS);
59	59	referValue.setModifiedDate(System.currentTimeMillis());