From 9a4fba1827636631645a3b7eaa6e698565356dcc Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 21 Jun 2024 14:13:15 +0800
Subject: [PATCH 1/3] 11222

---
 api/dao/product.go      | 2 +-
 api/requests/product.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/dao/product.go b/api/dao/product.go
index 2568d3a..476112e 100644
--- a/api/dao/product.go
+++ b/api/dao/product.go
@@ -149,7 +149,7 @@ func (r *ProductDao) GetProductPageSearch(req requests.GetProductPage, page, pag
 
 	// 排序
 	if req.Order != nil {
-		if req.Order.Stock != "" {
+		if req.Order.Stock != "no" {
 			query = query.Joins("JOIN gdxz_product_platform_amount ON gdxz_product_platform_amount.product_platform_id = gdxz_product.product_platform_id").
 				Order("gdxz_product_platform_amount.stock " + req.Order.Stock)
 		}
diff --git a/api/requests/product.go b/api/requests/product.go
index 9028a34..a61ab41 100644
--- a/api/requests/product.go
+++ b/api/requests/product.go
@@ -71,7 +71,7 @@ type GetProductList struct {
 }
 
 type GetProductPageOrder struct {
-	Stock string `json:"stock" form:"stock" label:"库存" validate:"oneof=desc asc"`
+	Stock string `json:"stock" form:"stock" label:"库存" validate:"oneof=desc asc no"`
 }
 
 // AddProduct 新增商品

From f4b11bc7eaaee78e443c7d3ef04e129c0617298f Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 21 Jun 2024 14:14:59 +0800
Subject: [PATCH 2/3] 3333333

---
 api/requests/product.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/requests/product.go b/api/requests/product.go
index a61ab41..9658fbb 100644
--- a/api/requests/product.go
+++ b/api/requests/product.go
@@ -71,7 +71,7 @@ type GetProductList struct {
 }
 
 type GetProductPageOrder struct {
-	Stock string `json:"stock" form:"stock" label:"库存" validate:"oneof=desc asc no"`
+	Stock string `json:"stock" form:"stock" label:"库存"`
 }
 
 // AddProduct 新增商品

From f50181886618dba0f7e22241e2376ed0bce8e2c3 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 21 Jun 2024 14:16:06 +0800
Subject: [PATCH 3/3] 3333333

---
 api/dao/product.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/dao/product.go b/api/dao/product.go
index 476112e..2b7bbce 100644
--- a/api/dao/product.go
+++ b/api/dao/product.go
@@ -149,7 +149,11 @@ func (r *ProductDao) GetProductPageSearch(req requests.GetProductPage, page, pag
 
 	// 排序
 	if req.Order != nil {
-		if req.Order.Stock != "no" {
+		if req.Order.Stock != "" {
+			if req.Order.Stock != "desc" && req.Order.Stock != "asc" {
+				return nil, 0, errors.New("排序字段错误")
+			}
+
 			query = query.Joins("JOIN gdxz_product_platform_amount ON gdxz_product_platform_amount.product_platform_id = gdxz_product.product_platform_id").
 				Order("gdxz_product_platform_amount.stock " + req.Order.Stock)
 		}