1

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonDeviceFilterLogController.java

@@ -57,8 +57,12 @@ public class PersonDeviceFilterLogController {
                 DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(personDeviceFilterLog.getDeviceNo());
                 PersonInfo personInfo = personInfoService.get(Long.valueOf(personDeviceFilterLog.getPersonId()));
 
-                personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
-                personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                if(deviceInfo != null) {
+                    personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
+                }
+                if(personInfo != null) {
+                    personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                }
                 if(personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 1 || personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 0){
                     personDeviceFilterLogDTO.setFever(true);
                 }else {
@@ -120,8 +124,12 @@ public class PersonDeviceFilterLogController {
                 DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(personDeviceFilterLog.getDeviceNo());
                 PersonInfo personInfo = personInfoService.get(Long.valueOf(personDeviceFilterLog.getPersonId()));
 
-                personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
-                personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                if(deviceInfo != null) {
+                    personDeviceFilterLogDTO.setDeviceName(deviceInfo.getAliasName());
+                }
+                if(personInfo != null) {
+                    personDeviceFilterLogDTO.setPersonName(personInfo.getName());
+                }
                 if(personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 1){//|| personDeviceFilterLog.getTemperature().compareTo(new BigDecimal("37")) == 0
                     personDeviceFilterLogDTO.setFever(true);
                 }else {