From 6172ceaa668dee503386e94b3bf34f05c05a59c4 Mon Sep 17 00:00:00 2001 From: chenlin Date: Wed, 6 Nov 2024 18:38:41 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E7=88=B6=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/commodity.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/admin/models/commodity.go b/app/admin/models/commodity.go index 1a53160..7dcd2e6 100644 --- a/app/admin/models/commodity.go +++ b/app/admin/models/commodity.go @@ -2784,7 +2784,12 @@ func (m *ErpStockCommodityListReq) buildQueryConditions(qs *gorm.DB, nType uint3 } if m.ErpCategoryId != 0 { //商品分类id - qs = qs.Where("erp_category_id=?", m.ErpCategoryId) + categoryList, _ := GetSubcategoryIds(m.ErpCategoryId) + if categoryList == nil { + categoryList = append(categoryList, m.ErpCategoryId) + } + + qs = qs.Where("erp_category_id in ?", categoryList) } if m.IMEI != "" { //商品串码