remove storage.GetInstanceIdsByWorkflowID, remove dms.GetInstanceIdNa…

…meMapByIds
actiontech · Nov 7, 2023 · 31c1594 · 31c1594
1 parent 8e7b98e
commit 31c1594
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/sqle/api/controller/v1/project_permission.go b/sqle/api/controller/v1/project_permission.go
@@ -35,18 +35,8 @@ func CheckCurrentUserCanOperateWorkflow(c echo.Context, projectUid string, workf
 	}
 
 	if len(ops) > 0 {
-		instanceIds, err := s.GetInstanceIdsByWorkflowID(workflow.WorkflowId)
-		if err != nil {
-			return err
-		}
-
-		instances, err := dms.GetInstancesInProjectByIds(c.Request().Context(), string(workflow.ProjectId), instanceIds)
-		if err != nil {
-			return err
-		}
-
-		for _, instance := range instances {
-			if !up.CanOpInstanceNoAdmin(instance.GetIDStr(), ops...) {
+		for _, item := range workflow.Record.InstanceRecords {
+			if !up.CanOpInstanceNoAdmin(item.Instance.GetIDStr(), ops...) {
 				return ErrWorkflowNoAccess
 			}
 		}

diff --git a/sqle/server/workflow_schedule.go b/sqle/server/workflow_schedule.go
@@ -367,17 +367,8 @@ func CheckCurrentUserCanOperateWorkflowByUser(user *model.User, projectUid strin
 		return nil
 	}
 	if len(ops) > 0 {
-		instanceIds, err := s.GetInstanceIdsByWorkflowID(workflow.WorkflowId)
-		if err != nil {
-			return err
-		}
-
-		instances, err := dms.GetInstancesInProjectByIds(context.TODO(), string(workflow.ProjectId), instanceIds)
-		if err != nil {
-			return err
-		}
-		for _, instance := range instances {
-			if !up.CanOpInstanceNoAdmin(instance.GetIDStr(), ops...) {
+		for _, item := range workflow.Record.InstanceRecords {
+			if !up.CanOpInstanceNoAdmin(item.Instance.GetIDStr(), ops...) {
 				return ErrWorkflowNoAccess
 			}
 		}