事务传播行为，未添加注解的方法加入上一个事务

LocalSession.go

@@ -240,6 +240,14 @@ func (it *LocalSession) Begin(p *tx.Propagation) error {
 	return nil
 }
 
+func (it *LocalSession)LastPROPAGATION () *tx.Propagation{
+	if it.txStack.Len()!=0{
+		var _,pr=it.txStack.Last()
+		return pr
+	}
+	return nil
+}
+
 func (it *LocalSession) Close() {
 	if it.logSystem != nil {
 		it.logSystem.Println([]byte("[GoMybatis] ["+it.Id()+"] Close session"))

SessionFactory.go

@@ -1,6 +1,8 @@
 package GoMybatis
 
-import "sync"
+import (
+	"sync"
+)
 
 type SessionFactory struct {
 	Engine     SessionEngine
@@ -68,4 +70,4 @@ func (it *SessionFactory) CloseAll(id string) {
 		}
 		return true
 	})
-}
+}

SessionFactorySession.go

@@ -56,3 +56,7 @@ func (it *SessionFactorySession) Close() {
 		it.Factory.SessionMap.Delete(id)
 	}
 }
+
+func (it *SessionFactorySession) LastPROPAGATION () *tx.Propagation{
+	return it.Session.LastPROPAGATION()
+}

SqlEngine.go

@@ -19,6 +19,7 @@ type Session interface {
 	Commit() error
 	Begin(p *tx.Propagation) error
 	Close()
+	LastPROPAGATION () *tx.Propagation
 }
 
 //产生session的引擎

TransactionAspectSupport.go

@@ -55,10 +55,18 @@ func AopProxyServiceValue(service reflect.Value, engine SessionEngine) {
 				//压入map
 				engine.GoroutineSessionMap().Put(goroutineID, session)
 			}
-			var err = session.Begin(&propagation)
-			if err != nil {
-				panic(err)
+			if !haveTx {
+				var err = session.Begin(session.LastPROPAGATION())
+				if err != nil {
+					panic(err)
+				}
+			}else{
+				var err = session.Begin(&propagation)
+				if err != nil {
+					panic(err)
+				}
 			}
+
 			var nativeImplResult = doNativeMethod(funcField, arg, nativeImplFunc, session, engine.Log())
 			if !haveRollBackType(nativeImplResult, rollbackTag) {
 				var err = session.Commit()