From 7a32fe048580e49b6f1b06f37bd4dc1dd5241f39 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 11:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=A1=E6=A0=B8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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)