From 3115396024e3e7021696dfa9e7ac2157f0e6c225 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 27 八月 2024 18:20:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index d85acb7..88568db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -203,7 +203,7 @@
}
}
- @Transactional(propagation = Propagation.REQUIRES_NEW)
+// @Transactional
public AjaxResult getHISDataNew(String type, Map<String, Object> params){
LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, type);
@@ -375,6 +375,7 @@
* @param jsonObject
* @throws SQLException
*/
+ @Transactional
private void insertDataNew(Connection connection, JSONObject jsonObject,HisApiConfig hisApiConfig,String paramsJson) throws SQLException {
List<String> primaryKesList = Arrays.stream(hisApiConfig.getPrimaryKeys().split(",")).map(String::toLowerCase).collect(Collectors.toList());
StringBuilder deleteSqlBuilder = new StringBuilder();
--
Gitblit v1.8.0