From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
index 93b4818..901ef8d 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -119,7 +119,8 @@
Long bizId = itemCirculatOrderDto.getCirculatOrder().getId();
FlowInfoDto flowInfoDto = itemCirculatOrderDto.getFlowInfoDto();
- if ("tj".equals(flowInfoDto.getSubmitType()) || "bl".equals(flowInfoDto.getSubmitType())) {
+
+ if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
if ("tj".equals(flowInfoDto.getSubmitType())) {
workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
}
--
Gitblit v1.9.1