From 775405741aa8296e10a0fa51bfe2afac5b40d577 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Fri, 14 Jul 2023 15:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=8E=A7=E5=88=B6bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChartServiceImpl.java        | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index 2c2ff22e..becccc3e 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -401,8 +401,9 @@ public class ChartServiceImpl extends Service implements ChartService {
 
     @Override
     public Map<String, Object> versionRecord(Map<String, Object> params, User user) {
-        RecordSetTrans recordSetTrans = new RecordSetTrans();
-        recordSetTrans.setAutoCommit(false);//关闭自动提交
+
+
+
 
         RecordSet rs = new RecordSet();
 
@@ -425,12 +426,22 @@ public class ChartServiceImpl extends Service implements ChartService {
         if (rs.next()) {
             versionId = Util.null2String(rs.getString("id"));
         }
-        if ("0".equals(dimension)) {
-            //实体维度
-            trueDimension(recordSetTrans,versionId,currentUser,currentDate);
-        } else {
-            virtualDimension(recordSetTrans,versionId,currentUser,currentDate,dimension);
+
+        RecordSetTrans recordSetTrans = new RecordSetTrans();
+        try {
+            recordSetTrans.setAutoCommit(false);
+            if ("0".equals(dimension)) {
+                //实体维度
+                trueDimension(recordSetTrans,versionId,currentUser,currentDate);
+            } else {
+                virtualDimension(recordSetTrans,versionId,currentUser,currentDate,dimension);
+            }
+            recordSetTrans.commit();
+        } catch (Exception e) {
+            recordSetTrans.rollback();
+            e.printStackTrace();
         }
+
         Map<String, Object> result = new HashMap<>();
         result.put("api_status", true);
         return result;
@@ -824,7 +835,6 @@ public class ChartServiceImpl extends Service implements ChartService {
     private void insertData(RecordSetTrans recordSetTrans,String insertSql,List<List<Object>> insertParamList) {
         try {
             recordSetTrans.executeBatchSql(insertSql,insertParamList);
-            recordSetTrans.commit();
         } catch (Exception e) {
             recordSetTrans.rollback();
             e.printStackTrace();