Quellcode durchsuchen

fix:研报审批流添加

more vor 7 Monaten
Ursprung
Commit
9ebc939c93

+ 3 - 2
controllers/report_approve/report_approve_flow.go

@@ -8,10 +8,11 @@ import (
 	"eta_gn/eta_api/services"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // ReportApproveFlowController 报告审批流
@@ -243,7 +244,7 @@ func (this *ReportApproveFlowController) Add() {
 			br.ErrMsg = "获取审批流是否已存在失败, Err: " + e.Error()
 			return
 		}
-		if exist != nil {
+		if exist != nil && exist.ReportApproveFlowId > 0 {
 			br.Msg = "该分类已有审批流, 请勿重复添加"
 			return
 		}

+ 3 - 2
models/report_approve/report_approve_flow.go

@@ -4,9 +4,10 @@ import (
 	"eta_gn/eta_api/global"
 	"eta_gn/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"strings"
 	"time"
+
+	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
 // ReportApproveFlow 报告审批流表
@@ -294,7 +295,7 @@ func (m *ReportApproveFlow) CreateFlowAndNodes(flowItem *ReportApproveFlow, node
 	//	prevNode = v
 	//}
 
-	tx := global.DmSQL["data"].Begin()
+	tx := global.DmSQL["rddp"].Begin()
 	prevNodes := make([]*ReportApproveNode, 0)
 	defer func() {
 		if err != nil {