diff --git a/workflow/service/flow/flow_user_service.go b/workflow/service/flow/flow_user_service.go index d2e17ff..2fa337d 100644 --- a/workflow/service/flow/flow_user_service.go +++ b/workflow/service/flow/flow_user_service.go @@ -144,8 +144,38 @@ func (s *flowUserService) Get(ctx context.Context, req *flowDto.GetFlowUserReq) } func (s *flowUserService) List(ctx context.Context, req *flowDto.ListFlowUserReq) (res *flowDto.ListFlowRes, err error) { + admin, err := IsAdmin(ctx) + if err != nil { + return + } + if admin { + var t int + var l []*entity.FlowTemplate + l, t, err = flowDao.FlowTemplateDao.List(ctx, &flowDto.ListFlowTemplateReq{ + Keyword: req.Keyword, + Page: req.Page, + }) + if err != nil { + return + } + r := &flowDto.ListFlowTemplateRes{ + Total: t, + } + err = gconv.Struct(l, &r.List) + if err != nil { + return + } + res = &flowDto.ListFlowRes{ + ListFlowUserRes: nil, + ListFlowTemplateRes: r, + IsAdmin: admin, + } + return + } - l, t, err := flowDao.FlowTemplateDao.List(ctx, &flowDto.ListFlowTemplateReq{ + var t int + var l []*entity.FlowTemplate + l, t, err = flowDao.FlowTemplateDao.List(ctx, &flowDto.ListFlowTemplateReq{ Keyword: req.Keyword, Page: req.Page, }) @@ -171,10 +201,6 @@ func (s *flowUserService) List(ctx context.Context, req *flowDto.ListFlowUserReq if err != nil { return } - admin, err := IsAdmin(ctx) - if err != nil { - return - } res = &flowDto.ListFlowRes{ ListFlowUserRes: re, ListFlowTemplateRes: r, diff --git a/workflow/service/flow/lambda_node.go b/workflow/service/flow/lambda_node.go index 893d84b..4611388 100644 --- a/workflow/service/flow/lambda_node.go +++ b/workflow/service/flow/lambda_node.go @@ -478,7 +478,6 @@ func ImageModelLambda(ctx context.Context, input any) (any, error) { UserFiles: nodeInput.Global.FileUrl, SessionId: nodeInput.Global.SessionId, } - fmt.Println(req) msg, err := ComposeMessages(ctx, &req) if err != nil { return nil, err