From e94b669757bcc240eb490d8c0fa1a37ca8fdd7c3 Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 13 Jun 2023 19:36:15 +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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 3b2236c..aae0f95 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -595,7 +595,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { fmt.Println("list request :==================== end ===================") //我未阅读的和我未操作的 - queryApproval := &Approval{NowUserId: in.UserID} + queryApproval := &Approval{} if in.SubmitterName != "" { queryApproval.SubmitterName = in.SubmitterName @@ -610,11 +610,13 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { //} if in.ApprovalStatus <= StatusFail && in.ApprovalStatus > 0 { // 具体 的 审批状态 + queryApproval.NowUserId = in.UserID queryApproval.Status = int8(in.ApprovalStatus) } queryApprovalCopy := &ApprovalCopy{UserId: in.UserID} if in.ApprovalStatus > StatusFail { // 具体 的 阅读状态 + queryApprovalCopy.UserId = in.UserID if in.ApprovalStatus == 4 { queryApprovalCopy.Status = 1 } else if in.ApprovalStatus == 5 { @@ -638,8 +640,12 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { DB.Where(&Approval{NowUserId: in.UserID, Status: StatusDoing}). // 我需要审批的 Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的 } else { + sonQuery := DB.Where(queryApproval) + if in.ApprovalStatus > StatusFail { + sonQuery.Where(DB.Where("id in (?)", s1)) + } modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( - DB.Where(&Approval{SubmitterName: in.SubmitterName, Status: queryApproval.Status}).Or(DB.Where("now_user_id = ?", in.UserID)).Or(DB.Where("id in (?)", s1))) + sonQuery) } modelObj.Count(&count)