From c13ba09603a69918101d6278b1f38752821ebef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 29 May 2020 14:30:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BB=B7=E6=A0=BC=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/store_sku.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index d984c6e5e..13d7557e8 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1538,18 +1538,20 @@ func UpdateJdsWareID(db *DaoDB, storeSkuSyncInfo *StoreSkuSyncInfo) (err error) type tStoreSkuAudit struct { model.StoreSkuAudit model.SkuName + StoreName string `json:"storeName"` } func GetStoreSkuAudit(db *DaoDB, storeIDs, nameIDs, skuIDs, statuss []int, name, remark string, applyTimeStart, applyTimeEnd, auditTimeStart, auditTimeEnd time.Time, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) { var requestList []*tStoreSkuAudit sql := ` - SELECT SQL_CALC_FOUND_ROWS a.*, c.* + SELECT SQL_CALC_FOUND_ROWS a.*, c.*, d.name store_name FROM store_sku_audit a LEFT JOIN user b ON a.user_id = b.user_id LEFT JOIN sku_name c ON c.id = a.name_id AND c.deleted_at = ? + LEFT JOIN store d ON d.id = a.store_id AND d.deleted_at = ? WHERE a.deleted_at = ? ` - sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue} + sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue} if len(storeIDs) > 0 { sql += " AND a.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")" sqlParams = append(sqlParams, storeIDs)