gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
wucongxing8150 2024-06-21 14:17:36 +08:00
commit b61304250e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/dao/product.go
View File

@ -150,6 +150,10 @@ func (r *ProductDao) GetProductPageSearch(req requests.GetProductPage, page, pag
// 排序 // 排序
if req.Order != nil { if req.Order != nil {
if req.Order.Stock != "" { 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"). 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) Order("gdxz_product_platform_amount.stock " + req.Order.Stock)
} }

2
api/requests/product.go
View File

@ -71,7 +71,7 @@ type GetProductList struct {
} }
type GetProductPageOrder struct { type GetProductPageOrder struct {
Stock string `json:"stock" form:"stock" label:"库存" validate:"oneof=desc asc"` Stock string `json:"stock" form:"stock" label:"库存"`
} }
// AddProduct 新增商品 // AddProduct 新增商品