From 68adbed883616d5f26d0312f2cd54bd59bc8f14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B9=B3=E5=87=A1=E6=A2=A6?= <a1173589145@qq.com>
Date: Fri, 10 Jul 2020 09:17:35 +0800
Subject: [PATCH] =?UTF-8?q?SensitiveWord=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go           |  2 +-
 business/model/dao/sensitive_words.go | 13 ++++++++++---
 controllers/cms_sku.go                |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 2eac14c28..98e356684 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -727,7 +727,7 @@ func CheckHasSensitiveWord(word string) (bool, error) {
 }
 
 func IsSensitiveWordInList(str string) (bool, string) {
-	wordList, err := dao.GetSensitiveWordList(2)
+	wordList, err := dao.GetSensitiveWordList(3)
 	if err == nil {
 		for _, value := range wordList {
 			keyWord := value.Word
diff --git a/business/model/dao/sensitive_words.go b/business/model/dao/sensitive_words.go
index 51bb85388..fd7c2544e 100644
--- a/business/model/dao/sensitive_words.go
+++ b/business/model/dao/sensitive_words.go
@@ -7,13 +7,18 @@ import (
 	"time"
 )
 
-/*VendorID = 2 的时候是通用，保留之前的1，看后面会不会有扩展*/
+/*VendorID = 2 的时候是通用,3 查询所有，保留之前的1，看后面会不会有扩展*/
 func GetSensitiveWordList(vendorID int) (wordList []*model.SensitiveWord, err error) {
 	if vendorID == 0 {
 		vendorID = 2
 	}
-	sql := `SELECT * FROM sensitive_word WHERE deleted_at = ? AND vendor_id = ?`
-	err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue, vendorID)
+	if vendorID == 3 {
+		sql := `SELECT * FROM sensitive_word WHERE deleted_at = ?`
+		err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue)
+	} else {
+		sql := `SELECT * FROM sensitive_word WHERE deleted_at = ? AND vendor_id = ?`
+		err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue, vendorID)
+	}
 	return wordList, err
 }
 
@@ -34,6 +39,7 @@ func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string,
 		vendorID = 2
 	}
 	wordList.ID = id
+	wordList.VendorID = id
 	wordList.DeletedAt = time.Now()
 	wordList.LastOperator = userName
 	if _, err := UpdateEntity(nil, wordList, "deleted_at", "id", "last_operator", "vendor_id"); err != nil {
@@ -50,6 +56,7 @@ func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, us
 		vendorID = 2
 	}
 	wordList.ID = id
+	wordList.VendorID = vendorID
 	wordList.UpdatedAt = time.Now()
 	wordList.LastOperator = userName
 	if _, err := UpdateEntity(nil, wordList, params...); err != nil {
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index 0fe7d99dd..f8cf75f0d 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -344,7 +344,7 @@ func (c *SkuController) SyncSku() {
 // @router /GetSensitiveWordList [get]
 func (c *SkuController) GetSensitiveWordList() {
 	c.callGetSensitiveWordList(func(params *tSkuGetSensitiveWordListParams) (retVal interface{}, errCode string, err error) {
-		sensitiveWordList, err := dao.GetSensitiveWordList(2)
+		sensitiveWordList, err := dao.GetSensitiveWordList(params.VendorID)
 		var wordList []string
 		for _, value := range sensitiveWordList {
 			wordList = append(wordList, value.Word)