From 9b0ba0dde34a1882f9f1a18e596ff2ce1b3f40f9 Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Tue, 13 Jun 2023 19:50:31 +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 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkg/model/approval.go b/pkg/model/approval.go
index aae0f95..2c883be 100644
--- a/pkg/model/approval.go
+++ b/pkg/model/approval.go
@@ -614,9 +614,8 @@ func MyAllWorkApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		queryApproval.Status = int8(in.ApprovalStatus)
 	}
 
-	queryApprovalCopy := &ApprovalCopy{UserId: in.UserID}
+	queryApprovalCopy := &ApprovalCopy{}
 	if in.ApprovalStatus > StatusFail { // 具体 的 阅读状态
-		queryApprovalCopy.UserId = in.UserID
 		if in.ApprovalStatus == 4 {
 			queryApprovalCopy.Status = 1
 		} else if in.ApprovalStatus == 5 {
@@ -626,11 +625,12 @@ 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)
 	}
+
 	fmt.Println("queryApproval request :==================== start ===================")
 	fmt.Printf("queryApproval %+v\n", queryApproval)
 	fmt.Println("queryApproval request :====================  end  ===================")
@@ -638,11 +638,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.Where("user_id = ?", in.UserID).Select("approval_id")))) // 已完成，抄送给我的
 	} else {
 		sonQuery := DB.Where(queryApproval)
-		if in.ApprovalStatus > StatusFail {
-			sonQuery.Where(DB.Where("id in (?)", s1))
+		if in.ApprovalStatus > StatusFail || in.ApprovalStatus == 0 {
+			sonQuery.Or(DB.Where("status = ?", StatusOk).Where("id in (?)", s1.Where("user_id = ?", in.UserID).Select("approval_id")))
 		}
 		modelObj = modelObj.Where(&Approval{Type: in.Type}).Where(
 			sonQuery)
@@ -694,8 +694,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))) //抄送人(完成抄送)
 	}
 
@@ -761,8 +761,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))) //抄送人(完成抄送)
 	}