|
|
@@ -788,7 +788,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
|
|
|
Long districtId = v.getDistrictId();
|
|
|
vo.setDeviceNum(v.getDeviceNum());
|
|
|
vo.setDistrictId(v.getDistrictId());
|
|
|
- vo.setDistrictName(Emptys.check(districtMap.get(v.getDistrictId())) ? districtMap.get(v.getDistrictId()) : "未分配区域");
|
|
|
+ vo.setDistrictName(v.getDistrictId()==-1L ? "未分配区域" : districtMap.get(v.getDistrictId()));
|
|
|
//区域下的设备列表
|
|
|
List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = BeanUtil.copyToList(deviceMap.get(districtId), DeviceInfoDto.MercHomeDeviceVo.class);
|
|
|
if (CollUtil.isEmpty(deviceInfos)) {
|
