Merge branch 'open_v2' into 'master'
南京银行修改-县政府与开区不能共存 See merge request !1150
This commit is contained in:
+12
-6
@@ -560,12 +560,18 @@ public class AddrSvcController {
|
||||
//我们的结果
|
||||
JSONObject result = json.getJSONObject("result");
|
||||
//我们省级及以上有开发区,直接用我们的结果
|
||||
if (result.containsKey("devDistrictName")) {
|
||||
if (result.containsKey("devDistrictName") && StringUtils.isNotBlank(result.get("devDistrictName").toString())) {
|
||||
// basicModel.setResult(result);
|
||||
if(result.containsKey("countyGov") && StringUtils.isNotBlank(result.get("countyGov").toString())){
|
||||
result.put("countyGov","");
|
||||
}
|
||||
}
|
||||
basicModel.setResult(result);
|
||||
//齐梁现在无法调用
|
||||
/*else if (!"2".equals(type)) { // 对私的不用齐梁
|
||||
basicModel.setResult(result);
|
||||
|
||||
} else if (!"2".equals(type)) { // 对私的不用齐梁
|
||||
basicModel.setResult(result);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
try {
|
||||
//如果是江苏省或者浙江省 调用齐梁的结果
|
||||
if (result.containsKey("province") && ("中国".equals(result.getString("province")))) {
|
||||
@@ -615,7 +621,7 @@ public class AddrSvcController {
|
||||
basicModel.setResult(result);
|
||||
}
|
||||
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
mav.setModel(basicModel);
|
||||
|
||||
Reference in New Issue
Block a user