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 versionRecord(Map 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 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> insertParamList) { try { recordSetTrans.executeBatchSql(insertSql,insertParamList); - recordSetTrans.commit(); } catch (Exception e) { recordSetTrans.rollback(); e.printStackTrace();