From fb40e8f20030c2359053b9c3289c65ffa66b32fa Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Thu, 13 Apr 2023 18:42:21 +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=201.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg/model/approval.go b/pkg/model/approval.go
index 99c1f04..11220c3 100644
--- a/pkg/model/approval.go
+++ b/pkg/model/approval.go
@@ -11,7 +11,6 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"gorm.io/plugin/soft_delete"
-	"strings"
 	"time"
 )
 
@@ -687,15 +686,15 @@ func MySubmitApprovals(in *approval.ListRequest) ([]*Approval, int64) {
 		Preload("Exhibition.ApprovalExhibitions")
 
 	if in.Status != 0 {
-		modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
+		if in.Status == 6 {
+			modelObj.Where("status in ?", []int{4, 5})
+		} else {
+			modelObj = modelObj.Where(&Approval{Status: int8(in.Status)})
+		}
 	}
 
 	if in.Type != "" {
-		if len(strings.Split(in.Type, ",")) > 1 {
-			modelObj.Where("`type` in ?", strings.Split(in.Type, ","))
-		} else {
-			modelObj = modelObj.Where(&Approval{Type: in.Type})
-		}
+		modelObj = modelObj.Where(&Approval{Type: in.Type})
 	}
 
 	modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})