From 86c06b0f6f30099b436814ab223121aa8239081a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
index 145895d..86c5e57 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistorySecondUav;
import com.moral.api.entity.Organization;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.mapper.HistorySecondUavMapper;
import com.moral.api.pojo.dto.uav.UAVQueryTimeSlotDTO;
import com.moral.api.pojo.form.uav.UAVQueryTimeSlotForm;
@@ -142,7 +143,10 @@
List<Map<String, Object>> timeSlots = new ArrayList<>();
dto.setMac(key);
//������mac������������������
- dto.setName((String) specialDeviceService.getSpecialDeviceMapByMac(key).getName());
+ SpecialDevice specialDevice = specialDeviceService.getSpecialDeviceMapByMac(key);
+ if(specialDevice==null)
+ return;
+ dto.setName(specialDevice.getName());
//������������������batch
value.forEach(listValue -> {
listValue.forEach((mKey, mValue) -> {
--
Gitblit v1.8.0