|
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.care.common.entity.CareDevice;
|
|
|
+import com.care.common.entity.CareOrganization;
|
|
|
import com.care.common.entity.CareStation;
|
|
|
import com.care.common.enums.DeviceActiveStatusEnum;
|
|
|
import com.care.common.exception.BDException;
|
|
@@ -63,7 +64,8 @@ public class StationService {
|
|
|
QueryWrapper<CareDevice> queryWrapper1 = new QueryWrapper<>();
|
|
|
queryWrapper1.lambda().eq(CareDevice::getStationId,resVO.getId());
|
|
|
resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
|
|
|
- resVO.setOrgName(this.careOrganizationService.getById(resVO.getOrgId()).getName());
|
|
|
+ CareOrganization org = this.careOrganizationService.getById(resVO.getOrgId());
|
|
|
+ resVO.setOrgName(org!=null?org.getName():"");
|
|
|
list.add(resVO);
|
|
|
});
|
|
|
results.setRecords(list);
|