From ddc3c5f70ed391c55dc83cc9d9e9c6d1fa672de5 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 30 十一月 2023 10:58:41 +0800
Subject: [PATCH] 项目表
---
modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..738cd08 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);
}
@@ -134,8 +135,9 @@
data.setId(circulatOrderid);
ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
data.setCirculatOrder(itemCirculatOrder);
-
- projectId = itemCirculatOrder.getProjectId();
+ if (projectId==null){
+ projectId = itemCirculatOrder.getProjectId();
+ }
data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));
--
Gitblit v1.9.1