From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
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