From 3260a06c24c3624bdcb25110fd86f38a7a563cf8 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期四, 28 七月 2022 11:42:29 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/whyc/service/WorksheetLinkService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 2e5c4de..946da4a 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -105,9 +105,10 @@
             //鍒犻櫎? TODO 闇�瑕佺害瀹氶�昏緫
 
             //鏌ヨ閮ㄤ欢鏈�鏂扮殑鐗堟湰鍙�
-            Integer currentVersion = bomService.getProduct(approvingList.get(0).getParentModel()).getVersion();
-            if(currentVersion==null){
-                currentVersion = 0;
+            ProductBom product = bomService.getProduct(approvingList.get(0).getParentModel());
+            int currentVersion = -1;
+            if(product!=null){
+                currentVersion = product.getVersion();
             }
             Integer nextVersion = currentVersion+1;
             //鏇存柊鍒皃roduct_bom_history,澧炲姞杩涘幓鐨勯渶瑕乻Version鍜宔Version涓�鑷�

--
Gitblit v1.9.1