From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
index 902575a..5b33ee6 100755
--- a/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
+++ b/java110-core/src/main/java/com/java110/core/aop/Java110TransactionalAop.java
@@ -119,12 +119,17 @@
         } catch (Throwable e) {
             logger.error("鎵ц鏂规硶寮傚父", e);
             //鍥為��浜嬪姟
-            Java110TransactionalFactory.fallbackOId();
+            if (StringUtil.isEmpty(curOId)) {
+                Java110TransactionalFactory.fallbackOId();
+            }
             //return new BusinessDto(BusinessDto.CODE_ERROR, "鍐呴儴寮傚父" + e.getLocalizedMessage());
             throw e;
         } finally {
-            //娓呯悊浜嬪姟淇℃伅
-            Java110TransactionalFactory.clearOId();
+            //瀹屾垚浜嬪姟
+            if (StringUtil.isEmpty(curOId)) {
+                //娓呯悊浜嬪姟淇℃伅
+                Java110TransactionalFactory.clearOId();
+            }
         }
     }
 }

--
Gitblit v1.8.0