Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+9
-4
@@ -812,7 +812,7 @@ public class AddrSvcController {
|
|||||||
}
|
}
|
||||||
if (result.containsKey("verifyFlag")) {
|
if (result.containsKey("verifyFlag")) {
|
||||||
map.put("verifyFlag", result.getString("verifyFlag"));
|
map.put("verifyFlag", result.getString("verifyFlag"));
|
||||||
}else{
|
} else {
|
||||||
basicModel.markNoData();
|
basicModel.markNoData();
|
||||||
}
|
}
|
||||||
if (result.containsKey("addrVerify")) {
|
if (result.containsKey("addrVerify")) {
|
||||||
@@ -901,7 +901,7 @@ public class AddrSvcController {
|
|||||||
resultMap.put("devLevel", villageResult.getDevLevel());
|
resultMap.put("devLevel", villageResult.getDevLevel());
|
||||||
resultMap.put("addrArea", villageResult.getAddrArea());
|
resultMap.put("addrArea", villageResult.getAddrArea());
|
||||||
BasicModel basicModel = new BasicModel(200, "OK");
|
BasicModel basicModel = new BasicModel(200, "OK");
|
||||||
if (StringUtils.isBlank(resultMap.get("verifyFlag"))){
|
if (StringUtils.isBlank(resultMap.get("verifyFlag"))) {
|
||||||
basicModel.markNoData();
|
basicModel.markNoData();
|
||||||
}
|
}
|
||||||
basicModel.setResult(resultMap);
|
basicModel.setResult(resultMap);
|
||||||
@@ -985,8 +985,13 @@ public class AddrSvcController {
|
|||||||
resultMap.put("devDistrictName", villageResult.getDevDistrictName());
|
resultMap.put("devDistrictName", villageResult.getDevDistrictName());
|
||||||
resultMap.put("devLevel", villageResult.getDevLevel());
|
resultMap.put("devLevel", villageResult.getDevLevel());
|
||||||
resultMap.put("addrArea", villageResult.getAddrArea());
|
resultMap.put("addrArea", villageResult.getAddrArea());
|
||||||
|
if (StringUtils.isNotBlank(villageResult.getDistrict()) && villageResult.getDistrict().endsWith("区")) {
|
||||||
|
resultMap.put("prefectureLevelOrAbove ", "是");
|
||||||
|
}else {
|
||||||
|
resultMap.put("prefectureLevelOrAbove ", "否");
|
||||||
|
}
|
||||||
BasicModel basicModel = new BasicModel(200, "OK");
|
BasicModel basicModel = new BasicModel(200, "OK");
|
||||||
if (StringUtils.isBlank(resultMap.get("verifyFlag"))){
|
if (StringUtils.isBlank(resultMap.get("verifyFlag"))) {
|
||||||
basicModel.markNoData();
|
basicModel.markNoData();
|
||||||
}
|
}
|
||||||
basicModel.setResult(resultMap);
|
basicModel.setResult(resultMap);
|
||||||
@@ -1131,7 +1136,7 @@ public class AddrSvcController {
|
|||||||
resultMap.put("devLevel", villageResult.getDevLevel());
|
resultMap.put("devLevel", villageResult.getDevLevel());
|
||||||
resultMap.put("addrArea", villageResult.getAddrArea());
|
resultMap.put("addrArea", villageResult.getAddrArea());
|
||||||
BasicModel basicModel = new BasicModel(200, "OK");
|
BasicModel basicModel = new BasicModel(200, "OK");
|
||||||
if (StringUtils.isBlank(resultMap.get("verifyFlag"))){
|
if (StringUtils.isBlank(resultMap.get("verifyFlag"))) {
|
||||||
basicModel.markNoData();
|
basicModel.markNoData();
|
||||||
}
|
}
|
||||||
basicModel.setResult(resultMap);
|
basicModel.setResult(resultMap);
|
||||||
|
|||||||
Reference in New Issue
Block a user