From 7af578eedabca72b5fe623d9cf05135f7bf0bd25 Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 13 Jun 2023 19:05:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/model/approval.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 6fe025e..9bad259 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -624,7 +624,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { } DB.Model(&Approval{}).Where(&Approval{Type: in.Type}).Where(queryApproval).Order("id " + in.OrderBy).Select("id").Find(&ids) - s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id") + s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy) if in.StartTime != "" && in.EndTime != "" { modelObj = modelObj.Where(" created_at between ? and ? ", in.StartTime, in.EndTime) @@ -636,11 +636,11 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { if in.SubmitterName == "" && in.ApprovalStatus == 0 { modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的 - Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 + Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1).Select("approval_id"))) // 已完成，抄送给我的 } else { sonQuery := DB.Where(queryApproval) if in.ApprovalStatus > StatusFail { - sonQuery.Where(DB.Where("id in (?)", s1)) + sonQuery.Or(DB.Where("id in (?)", s1.Where("approval_id in (?)").Select("approval_id"))) } modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( sonQuery)