suntianwu 3 tahun lalu
induk
melakukan
a4d722ad4e
1 mengubah file dengan 5 tambahan dan 2 penghapusan
  1. 5 2
      src/main/java/com/care/bms/service/StationService.java

+ 5 - 2
src/main/java/com/care/bms/service/StationService.java

@@ -65,7 +65,7 @@ public class StationService {
                 queryWrapper1.lambda().eq(CareDevice::getStationId,resVO.getId());
                 resVO.setDevCount(this.careDeviceService.count(queryWrapper1));
                 CareOrganization org = this.careOrganizationService.getById(resVO.getOrgId());
-                resVO.setOrgName(org!=null?org.getName():"");
+                resVO.setOrgName(org != null? org.getName() : "");
                 list.add(resVO);
             });
             results.setRecords(list);
@@ -94,7 +94,10 @@ public class StationService {
             vo.setDeviceVOList(deviceVOList);
             vo.setDevCount(deviceVOList.size());
         }
-        vo.setOrgName(this.careOrganizationService.getById(vo.getOrgId()).getName());
+        CareOrganization careOrganization = this.careOrganizationService.getById(vo.getOrgId());
+        if(careOrganization != null){
+            vo.setOrgName(careOrganization.getName());
+        }
         return vo;
     }