|
@@ -84,7 +84,8 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
|
|
|
if (null != project.get("regionId")) {
|
|
|
if (project.get("regionId").equals(id)) {
|
|
|
projectNum += 1;
|
|
|
- num += (Integer) project.get("num");
|
|
|
+ //如果项目电梯数量为null,就设置0
|
|
|
+ num += null != project.get("num") ? (Integer) project.get("num") : 0;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -140,7 +141,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
|
|
|
result.put("regionUser", null);
|
|
|
} else {
|
|
|
//区域下,只会有一个区域主管,所以查出来列表,只需要第一个
|
|
|
- result.put("regionUser",regionUser.get(0));
|
|
|
+ result.put("regionUser", regionUser.get(0));
|
|
|
}
|
|
|
}
|
|
|
if (null != region.getClerk() && !region.getClerk().equals("-1")) {
|