Merge pull request #3867 from PetrusZ/fix/approval_runtime

fix lark approval runtime input bug
koderover · Dec 3, 2024 · 20977c8 · 20977c8
2 parents 7d88076 + 0fa5b0b
commit 20977c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/workflow_task_v4.go b/pkg/microservice/aslan/core/workflow/service/workflow/workflow_task_v4.go
@@ -612,6 +612,10 @@ func CreateWorkflowTaskV4(args *CreateWorkflowTaskV4Args, workflow *commonmodels
 		return resp, err
 	}
 
+	if err := createLarkApprovalDefinition(workflow); err != nil {
+		return resp, errors.Wrap(err, "create lark approval definition")
+	}
+
 	workflow.HookCtls = nil
 	workflow.JiraHookCtls = nil
 	workflow.MeegoHookCtls = nil

diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/workflow_v4.go b/pkg/microservice/aslan/core/workflow/service/workflow/workflow_v4.go
@@ -95,11 +95,6 @@ func CreateWorkflowV4(user string, workflow *commonmodels.WorkflowV4, logger *za
 	if err := LintWorkflowV4(workflow, logger); err != nil {
 		return err
 	}
-	// lark approval different node type need different approval definition
-	// check whether lark approvals in workflow need to create lark approval definition
-	if err := createLarkApprovalDefinition(workflow); err != nil {
-		return errors.Wrap(err, "create lark approval definition")
-	}
 
 	workflow.CreatedBy = user
 	workflow.UpdatedBy = user
@@ -278,11 +273,6 @@ func UpdateWorkflowV4(name, user string, inputWorkflow *commonmodels.WorkflowV4,
 			}
 		}
 	}
-	// lark approval different node type need different approval definition
-	// check whether lark approvals in workflow need to create lark approval definition
-	if err := createLarkApprovalDefinition(inputWorkflow); err != nil {
-		return errors.Wrap(err, "create lark approval definition")
-	}
 
 	if err := commonrepo.NewWorkflowV4Coll().Update(
 		workflow.ID.Hex(),