修改查询 已阅和待阅读 1.0

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 = modelObj.Where(&Approval{Type: in.Type})
-			modelObj.Where("`type` in ?", strings.Split(in.Type, ","))
-		} else {
-			modelObj = modelObj.Where(&Approval{Type: in.Type})
-		}
 	}
 
 	modelObj = modelObj.Where(&Approval{SubmitterID: in.UserID})