From efcd9fcdce09f92275e414e82fb56b3ff1d5b8bf Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Tue, 13 Jun 2023 14:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6,=E6=9F=A5=E8=AF=A2=E5=85=A8=E9=83=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9,=E4=B8=8D=E5=8C=85=E5=90=AB=E6=8A=84=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval.go | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkg/model/approval.go b/pkg/model/approval.go
index 8e6119b..313f6f8 100644
--- a/pkg/model/approval.go
+++ b/pkg/model/approval.go
@@ -610,12 +610,15 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 	}
 	s1 := DB.Model(&ApprovalCopy{}).Where(queryApprovalCopy).Select("approval_id")
 
-	/*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))) // 已完成，抄送给我的	*/
-	modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
-		DB.Where(queryApproval). // 我需要审批的
-						Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1))) // 已完成，抄送给我的
+	if queryApproval.SubmitterName == "" && in.Status == 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))) // 已完成，抄送给我的
+	} else {
+		modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
+			DB.Where(queryApproval)) // 我需要审批的
+	}
+
 	modelObj.Count(&count)
 
 	if len(ids) > 0 { //根据具体id排序
@@ -662,8 +665,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))) //抄送人(完成抄送)
 	}
 
@@ -729,8 +732,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))) //抄送人(完成抄送)
 	}