From 1b05f4d956a04528345eb5623e0085004caa7446 Mon Sep 17 00:00:00 2001
From: skx <610262374@qq.com>
Date: Wed, 4 Nov 2020 19:56:52 +0800
Subject: [PATCH] -

---
 .../Oracle/Insertable/OracleInsertable.cs       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Src/Asp.Net/SqlSugar/Realization/Oracle/Insertable/OracleInsertable.cs b/Src/Asp.Net/SqlSugar/Realization/Oracle/Insertable/OracleInsertable.cs
index bfef01ea9..952c90ef8 100644
--- a/Src/Asp.Net/SqlSugar/Realization/Oracle/Insertable/OracleInsertable.cs
+++ b/Src/Asp.Net/SqlSugar/Realization/Oracle/Insertable/OracleInsertable.cs
@@ -50,7 +50,7 @@ namespace SqlSugar
             var isDisableMasterSlaveSeparation = this.Context.Ado.IsDisableMasterSlaveSeparation;
             this.Context.Ado.IsDisableMasterSlaveSeparation = true;
             var count = Ado.ExecuteCommand(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
-            var result = (this.GetIdentityKeys().IsNullOrEmpty() || count == 0) ? 0 :Convert.ToInt64(GetSeqValue(GetSeqName()));
+            var result = (this.GetIdentityKeys().IsNullOrEmpty() || count == 0) ? 0 : Convert.ToInt64(GetSeqValue(GetSeqName()));
             this.Context.Ado.IsDisableMasterSlaveSeparation = isDisableMasterSlaveSeparation;
 
             AutoEnd(oldIsAuto);
@@ -67,7 +67,7 @@ namespace SqlSugar
             RestoreMapping();
             var isDisableMasterSlaveSeparation = this.Context.Ado.IsDisableMasterSlaveSeparation;
             this.Context.Ado.IsDisableMasterSlaveSeparation = true;
-            var count =await Ado.ExecuteCommandAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
+            var count = await Ado.ExecuteCommandAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
             var result = (this.GetIdentityKeys().IsNullOrEmpty() || count == 0) ? 0 : GetSeqValue(GetSeqName()).ObjToInt();
             this.Context.Ado.IsDisableMasterSlaveSeparation = isDisableMasterSlaveSeparation;
 
@@ -85,7 +85,7 @@ namespace SqlSugar
             RestoreMapping();
             var isDisableMasterSlaveSeparation = this.Context.Ado.IsDisableMasterSlaveSeparation;
             this.Context.Ado.IsDisableMasterSlaveSeparation = true;
-            var count =await Ado.ExecuteCommandAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
+            var count = await Ado.ExecuteCommandAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
             var result = (this.GetIdentityKeys().IsNullOrEmpty() || count == 0) ? 0 : Convert.ToInt64(GetSeqValue(GetSeqName()));
             this.Context.Ado.IsDisableMasterSlaveSeparation = isDisableMasterSlaveSeparation;
 
@@ -98,7 +98,8 @@ namespace SqlSugar
             if (oldIsAuto)
             {
                 this.Context.Context.CurrentConnectionConfig.IsAutoCloseConnection = oldIsAuto;
-                this.Context.Ado.Close();
+                if (this.Ado.Transaction == null)
+                    this.Context.Ado.Close();
             }
         }
 
@@ -114,7 +115,7 @@ namespace SqlSugar
         }
         private object GetSeqValue(string seqName)
         {
-           return Ado.GetScalar(" SELECT " + seqName + ".currval FROM DUAL");
+            return Ado.GetScalar(" SELECT " + seqName + ".currval FROM DUAL");
         }
         protected override void PreToSql()
         {
@@ -129,15 +130,15 @@ namespace SqlSugar
                     int seqBeginValue = 0;
                     seqBeginValue = this.Ado.GetInt("select  " + seqName + ".Nextval  from dual");
                     //Console.WriteLine(seqBeginValue);
-                    var nextLength= insertCount - 1;
+                    var nextLength = insertCount - 1;
                     if (nextLength > 0)
                     {
                         StringBuilder sb = new StringBuilder();
-                        sb.AppendLine(" select "+ seqName + ".nextval,t.* from (");
+                        sb.AppendLine(" select " + seqName + ".nextval,t.* from (");
                         for (int i = 0; i < nextLength; i++)
                         {
                             sb.AppendLine(" select 1 from dual");
-                            if (i<(nextLength - 1) )
+                            if (i < (nextLength - 1))
                             {
                                 sb.AppendLine("union all");
                             }