From 55a58aa095ba478cac0b39f08247849758b60301 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 06 Feb 2024 14:04:50 +0800
Subject: [PATCH] 已办任务逻辑修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index f0f75ff..5191f85 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -266,8 +266,10 @@
 				BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
 				PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
 
-				bladeFlow.setDetail(byId);
-				bladeFlowVOList.add(bladeFlow);
+				if (byId != null){
+					bladeFlow.setDetail(byId);
+					bladeFlowVOList.add(bladeFlow);
+				}
 			});
 		}
 		//设置数据集

--
Gitblit v1.9.3