From c6a05cc862a98abd7d16560e7ac2ab9bf4e12feb Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 21 九月 2023 09:28:07 +0800
Subject: [PATCH] 修改雷达报警数据合并

---
 ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index 0832eee..d6ab9f7 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -55,7 +55,10 @@
     @Override
     public ArdAppTask selectArdAppTaskById(String id) {
         ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id);
-
+        if(StringUtils.isNull(ardAppTask))
+        {
+            return null;
+        }
         List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList();
         if(ardAppTaskDetailList.size()>0)
         {

--
Gitblit v1.9.3