diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 8e3d97696..d984c6e5e 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -1535,15 +1535,21 @@ func UpdateJdsWareID(db *DaoDB, storeSkuSyncInfo *StoreSkuSyncInfo) (err error) return err } +type tStoreSkuAudit struct { + model.StoreSkuAudit + model.SkuName +} + 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 []*model.StoreSkuAudit + var requestList []*tStoreSkuAudit sql := ` - SELECT SQL_CALC_FOUND_ROWS a.* + SELECT SQL_CALC_FOUND_ROWS a.*, c.* 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 = ? WHERE a.deleted_at = ? ` - sqlParams := []interface{}{utils.DefaultTimeValue} + sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue} if len(storeIDs) > 0 { sql += " AND a.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")" sqlParams = append(sqlParams, storeIDs)