修改筛选

internal/api/manage/goods/query.go

@@ -215,12 +215,16 @@ func QueryGoodsList(c *gin.Context) {
 		}
 
 	}
+	where7 := dbc.DB
 	//新增内容结束
+	if p.IsSale {
+		where7 = dbc.DB.Where("is_sale=?", p.IsSale)
+	}
 
 	var total uint
 	var goodsList []goods.Information
-	dbc.DB.Table((&goods.Information{}).TableName()).Where("is_sale=?", p.IsSale).
-		Where(where1).Where(where2).Where(where3).Where(where4).Where(where5).Where(where6).Where(goods.Information{
+	dbc.DB.Table((&goods.Information{}).TableName()).
+		Where(where1).Where(where2).Where(where3).Where(where4).Where(where5).Where(where6).Where(where7).Where(goods.Information{
 		BrandID:          p.BrandID,
 		VendorID:         p.VendorID,
 		FirstCategoryID:  p.FirstCateID,
@@ -228,7 +232,7 @@ func QueryGoodsList(c *gin.Context) {
 	}).Count(&total)
 
 	dbc.DB.Limit(limit).Offset(limit*p.Page).Where("is_sale=?", p.IsSale).
-		Where(where1).Where(where2).Where(where3).Where(where4).Where(where5).Where(where6).Find(&goodsList, goods.Information{
+		Where(where1).Where(where2).Where(where3).Where(where4).Where(where5).Where(where6).Where(where7).Find(&goodsList, goods.Information{
 		BrandID:          p.BrandID,
 		VendorID:         p.VendorID,
 		FirstCategoryID:  p.FirstCateID,