From 2746ffdd086eef146d72f9a4821c66fe020287aa Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 11 May 2023 19:53:55 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=88=A4=E6=96=AD=E4=BA=86?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=BA=8B=E5=8A=A1=E6=95=B0=E7=BB=84=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=A4=A7=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/util/TranUtil.java             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
index e554d918e..36bc399fc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/util/TranUtil.java
@@ -48,8 +48,10 @@ public class TranUtil {
             errTask = function.apply(request, allTransactionConsumer);
 
         } catch (Exception ex) {
-            TransactionStatus transactionStatus = commits.removeLast();
-            txManager.rollback(transactionStatus);
+            if (commits.size() > 0) {
+                TransactionStatus transactionStatus = commits.removeLast();
+                txManager.rollback(transactionStatus);
+            }
             throw new BadRequestException(ex.getMessage());
         } finally {
             //过滤异常事务的任务id