From ff7234ac1fefe573ae3f03667a748e3351ee6b1b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 May 2023 20:44:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
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 b7988f6..71846e8 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
@@ -218,8 +218,10 @@
List<BladeFlow> data = res.getData();
data.forEach(bladeFlow -> {
PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
- byId.setFlow(bladeFlow);
- patrolTaskList.add(byId);
+ if (byId != null){
+ byId.setFlow(bladeFlow);
+ patrolTaskList.add(byId);
+ }
});
}
//设置数据集
--
Gitblit v1.9.3