Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-08-04 15:10:08 +08:00
@@ -564,12 +564,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")))) {
@@ -619,7 +625,7 @@ public class AddrSvcController {
basicModel.setResult(result);
}
}
}*/
}
mav.setModel(basicModel);