Merge remote-tracking branch 'origin/master'

This commit is contained in:
沈健
2025-03-03 17:45:08 +08:00
@@ -812,6 +812,8 @@ public class AddrSvcController {
}
if (result.containsKey("verifyFlag")) {
map.put("verifyFlag", result.getString("verifyFlag"));
}else{
basicModel.markNoData();
}
if (result.containsKey("addrVerify")) {
map.put("addrVerify", result.getString("addrVerify"));
@@ -899,6 +901,9 @@ public class AddrSvcController {
resultMap.put("devLevel", villageResult.getDevLevel());
resultMap.put("addrArea", villageResult.getAddrArea());
BasicModel basicModel = new BasicModel(200, "OK");
if (StringUtils.isBlank(resultMap.get("verifyFlag"))){
basicModel.markNoData();
}
basicModel.setResult(resultMap);
mav.setModel(basicModel);
} else {
@@ -981,6 +986,9 @@ public class AddrSvcController {
resultMap.put("devLevel", villageResult.getDevLevel());
resultMap.put("addrArea", villageResult.getAddrArea());
BasicModel basicModel = new BasicModel(200, "OK");
if (StringUtils.isBlank(resultMap.get("verifyFlag"))){
basicModel.markNoData();
}
basicModel.setResult(resultMap);
mav.setModel(basicModel);
} else {
@@ -1123,6 +1131,9 @@ public class AddrSvcController {
resultMap.put("devLevel", villageResult.getDevLevel());
resultMap.put("addrArea", villageResult.getAddrArea());
BasicModel basicModel = new BasicModel(200, "OK");
if (StringUtils.isBlank(resultMap.get("verifyFlag"))){
basicModel.markNoData();
}
basicModel.setResult(resultMap);
mav.setModel(basicModel);
} else {