From 4e23a6722cd1633731395331c6916804662e3894 Mon Sep 17 00:00:00 2001 From: jhc <9316338+wangyitao309@user.noreply.gitee.com> Date: Tue, 13 Jun 2023 16:51:20 +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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/model/approval.go b/pkg/model/approval.go index 01dda40..05d1b29 100644 --- a/pkg/model/approval.go +++ b/pkg/model/approval.go @@ -592,7 +592,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { //我未阅读的和我未操作的 queryApproval := &Approval{NowUserId: in.UserID} - if in.ApprovalStatus == 0 { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing + if in.ApprovalStatus == 0 && in.SubmitterName == "" { // 此处 为 阅读状态 表示 审批状态 默认为 StatusDoing queryApproval.Status = StatusDoing } @@ -633,7 +633,7 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { // } modelObj = modelObj.Where(&Approval{Type: in.Type}).Where( DB.Where(queryApproval). // 我需要审批的 - Or(DB.Where("id in (?)", s1))) + Or(DB.Where("id in (?)", s1))) //} modelObj.Count(&count) @@ -682,8 +682,8 @@ func MyApprovalWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { if in.UserID != 0 { modelObj = modelObj.Where( DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). - Where("status != ?", StatusDoing). //完成，我参与审批 - Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, + Where("status != ?", StatusDoing). //完成，我参与审批 + Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) } @@ -749,8 +749,8 @@ func MyWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) { if in.UserID != 0 { modelObj = modelObj.Where( DB.Where("JSON_CONTAINS(approval_users,JSON_OBJECT('ID', ?))", in.UserID). - Where("status != ?", StatusDoing). //完成，我参与审批 - Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, + Where("status != ?", StatusDoing). //完成，我参与审批 + Or(DB.Where("now_user_id", in.UserID).Where("status = ?", StatusDoing)). //进行中，当前审批人是我, Or(DB.Where("JSON_CONTAINS(copy_users,JSON_OBJECT('ID', ?))", in.UserID).Where("status = ?", StatusOk))) //抄送人(完成抄送) }