aa
This commit is contained in:
@@ -2269,16 +2269,16 @@ func CreateUpcSkuByExcelBin(ctx *jxcontext.Context, reader io.Reader, categoryID
|
||||
skuName.Img5 = downloadURL
|
||||
}
|
||||
}
|
||||
if !isUpdate{
|
||||
if !isUpdate {
|
||||
_, err = AddSkuName(ctx, skuName, ctx.GetUserName())
|
||||
}else{
|
||||
} else {
|
||||
sku.Name = skuName.Name
|
||||
sku.Img = skuName.Img
|
||||
sku.Img2 = skuName.Img2
|
||||
sku.Img3 = skuName.Img3
|
||||
sku.Img4 = skuName.Img4
|
||||
sku.Img5 = skuName.Img5
|
||||
dao.UpdateEntity(db,sku,"Name","Img","Img2","Img3","Img4","Img5")
|
||||
dao.UpdateEntity(db, sku, "Name", "Img", "Img2", "Img3", "Img4", "Img5")
|
||||
}
|
||||
if err != nil {
|
||||
retVal = []*CreateUpcSkuByExcelErr{buildCreateUpcSkuByExcelErr(v, err.Error())}
|
||||
@@ -3112,8 +3112,8 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
|
||||
if keyword != "" {
|
||||
keywordLike := "%" + keyword + "%"
|
||||
sql += `
|
||||
AND (t1.name LIKE ? OR t1.prefix LIKE ? OR t2.comment LIKE ? OR t1.upc LIKE ?) `
|
||||
sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike)
|
||||
AND (t1.name LIKE ? OR t1.prefix LIKE ? OR t2.comment LIKE ? OR t1.upc LIKE ? OR t1.id LIKE ? OR t2.id LIKE ?) `
|
||||
sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
|
||||
}
|
||||
if len(skuNameIDs) > 0 {
|
||||
sql += " AND t1.id IN (" + dao.GenQuestionMarks(len(skuNameIDs)) + ")"
|
||||
|
||||
Reference in New Issue
Block a user