Commit cce55b78 authored by 韩桐桐's avatar 韩桐桐

bugfix:29825 判空

parent 11acbf70
...@@ -206,7 +206,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -206,7 +206,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//区内移装,需判断是否为同一地市,如果不是同一地市,返回异常 -> 610000#610200#610204#610204002 //区内移装,需判断是否为同一地市,如果不是同一地市,返回异常 -> 610000#610200#610204#610204002
if ("0".equals(tableData.get("transferType"))) { if ("0".equals(tableData.get("transferType"))) {
deviceList.forEach(device -> { deviceList.forEach(device -> {
String deviceCity = Arrays.stream(((String) device.get("USE_PLACE_CODE")).split("#")) Object usePlaceCodeObj = device.get("USE_PLACE_CODE");
if (usePlaceCodeObj == null) {
throw new BadRequest("没有查询到地市信息");
}
String deviceCity = Arrays.stream(((String) usePlaceCodeObj).split("#"))
.skip(1) .skip(1)
.findFirst() .findFirst()
.orElseThrow(() -> new BadRequest("没有查询到地市信息")); .orElseThrow(() -> new BadRequest("没有查询到地市信息"));
...@@ -217,7 +221,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -217,7 +221,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}); });
} else { } else {
deviceList.forEach(device -> { deviceList.forEach(device -> {
String deviceCity = Arrays.stream(((String) device.get("USE_PLACE_CODE")).split("#")) Object usePlaceCodeObj = device.get("USE_PLACE_CODE");
if (usePlaceCodeObj == null) {
throw new BadRequest("没有查询到地市信息");
}
String deviceCity = Arrays.stream(((String) usePlaceCodeObj).split("#"))
.skip(1) .skip(1)
.findFirst() .findFirst()
.orElseThrow(() -> new BadRequest("没有查询到地市信息")); .orElseThrow(() -> new BadRequest("没有查询到地市信息"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment