From ae68db0801b89aa31c4a4d4e506a68c641da97b3 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期四, 30 十一月 2023 17:42:50 +0800 Subject: [PATCH] 6 --- modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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 901ef8d..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 @@ -135,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