From 8230c35deab8cc33b059628423300020a7aa8a48 Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Thu, 13 Apr 2023 18:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E5=B7=B2=E9=98=85=E5=92=8C=E5=BE=85=E9=98=85=E8=AF=BB=202.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval.go      |  6 +-----
 pkg/serializer/approval.go | 10 ++++++++--
 pkg/service/approval.go    |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg/model/approval.go b/pkg/model/approval.go
index 11220c3..c273ce2 100644
--- a/pkg/model/approval.go
+++ b/pkg/model/approval.go
@@ -686,11 +686,7 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("Exhibition.ApprovalExhibitions")
 
 	if in.Status != 0 {
-		if in.Status == 6 {
-			modelObj.Where("status in ?", []int{4, 5})
-		} else {
-			modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
-		}
+		modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
 	}
 
 	if in.Type != "" {
diff --git a/pkg/serializer/approval.go b/pkg/serializer/approval.go
index e6e6ea6..92c4d09 100644
--- a/pkg/serializer/approval.go
+++ b/pkg/serializer/approval.go
@@ -98,11 +98,17 @@ func BuildApproval(entity *model.Approval, userId uint64) *approval.CreateReques
 }
 
 //BuildApprovals 处理单个detail返回
-func BuildApprovals(list []*model.Approval, userId uint64) (details []*approval.CreateRequest) {
+func BuildApprovals(list []*model.Approval, userId uint64, status int) (details []*approval.CreateRequest) {
 
 	for _, item := range list {
 		temp := BuildApproval(item, userId)
-		details = append(details, temp)
+		if status == 6 {
+			if temp.AllStatus == 4 || temp.AllStatus == 5 {
+				details = append(details, temp)
+			}
+		} else {
+			details = append(details, temp)
+		}
 	}
 
 	return details
diff --git a/pkg/service/approval.go b/pkg/service/approval.go
index 28d1c10..1abcea4 100644
--- a/pkg/service/approval.go
+++ b/pkg/service/approval.go
@@ -251,7 +251,7 @@ func (a *ApprovalProvider) MySubmit(ctx context.Context, in *approval.ListReques
 	list, count = model.MySubmitApprovals(in)
 
 	response.Count = uint64(count)
-	response.Data = serializer.BuildApprovals(list, in.UserID)
+	response.Data = serializer.BuildApprovals(list, in.UserID, 0)
 	return response, nil
 }
 
@@ -263,14 +263,14 @@ func (a *ApprovalProvider) MyWork(ctx context.Context, in *approval.ListRequest)
 	var list []*model.Approval
 	var count int64
 
-	if in.Status == 0 && in.ApprovedBossId == 0 {
+	if (in.Status == 0 || in.Status == 6) && in.ApprovedBossId == 0 {
 		list, count = model.MyAllWorkApprovals(in)
 	} else {
 		list, count = model.MyWorkApprovals(in)
 	}
 
 	response.Count = uint64(count)
-	response.Data = serializer.BuildApprovals(list, in.UserID)
+	response.Data = serializer.BuildApprovals(list, in.UserID, int(in.Status))
 	return response, nil
 }