From 946810c1771531c6b02b542cc0c3f6a6fe642633 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:06:24 +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 | 23 ++++++++++++++++++-----
 controllers/cms_sku.go                |  7 ++++---
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index c0344b3eb..2eac14c28 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()
+	wordList, err := dao.GetSensitiveWordList(2)
 	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 47055aa75..51bb85388 100644
--- a/business/model/dao/sensitive_words.go
+++ b/business/model/dao/sensitive_words.go
@@ -7,22 +7,32 @@ import (
 	"time"
 )
 
-func GetSensitiveWordList() (wordList []*model.SensitiveWord, err error) {
-	sql := `SELECT * FROM sensitive_word WHERE deleted_at = ?`
-	err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue)
+/*VendorID = 2 的时候是通用，保留之前的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)
 	return wordList, err
 }
 
 func InsertSensitiveWord(word string, vendorID int, userName string) error {
+	if vendorID == 0 {
+		vendorID = 2
+	}
 	sensitiveWord := &model.SensitiveWord{Word: word, VendorID: vendorID}
 	WrapAddIDCULDEntity(sensitiveWord, userName)
 	return CreateEntity(nil, sensitiveWord)
 }
 
-func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string) (word *model.SensitiveWord, err error) {
+func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string, vendorID int) (word *model.SensitiveWord, err error) {
 	if id == 0 {
 		return nil, errors.New("入参错误，找不到相应ID")
 	}
+	if vendorID == 0 {
+		vendorID = 2
+	}
 	wordList.ID = id
 	wordList.DeletedAt = time.Now()
 	wordList.LastOperator = userName
@@ -32,10 +42,13 @@ func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string)
 	return wordList, nil
 }
 
-func UpdateSensitiveWord(wordList *model.SensitiveWord, id int, userName string, params ...string) (word *model.SensitiveWord, err error) {
+func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, userName string, params ...string) (word *model.SensitiveWord, err error) {
 	if id == 0 {
 		return nil, errors.New("入参错误，找不到相应ID")
 	}
+	if vendorID == 0 {
+		vendorID = 2
+	}
 	wordList.ID = id
 	wordList.UpdatedAt = time.Now()
 	wordList.LastOperator = userName
diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go
index 8a4a5adca..0fe7d99dd 100644
--- a/controllers/cms_sku.go
+++ b/controllers/cms_sku.go
@@ -338,12 +338,13 @@ func (c *SkuController) SyncSku() {
 // @Title 获取敏感词列表
 // @Description 获取敏感词列表
 // @Param	token			header		string	true	"认证token"
+// @Param	vendorID		query		int		false	"VendorID"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetSensitiveWordList [get]
 func (c *SkuController) GetSensitiveWordList() {
 	c.callGetSensitiveWordList(func(params *tSkuGetSensitiveWordListParams) (retVal interface{}, errCode string, err error) {
-		sensitiveWordList, err := dao.GetSensitiveWordList()
+		sensitiveWordList, err := dao.GetSensitiveWordList(2)
 		var wordList []string
 		for _, value := range sensitiveWordList {
 			wordList = append(wordList, value.Word)
@@ -388,9 +389,9 @@ func (c *SkuController) UpdateSensitiveWord() {
 			},
 		}
 		if params.Status == 1 {
-			retVal, err = dao.DeleteSensitiveWord(word, params.ID, params.Ctx.GetUserName())
+			retVal, err = dao.DeleteSensitiveWord(word, params.ID, params.Ctx.GetUserName(), params.VendorID)
 		} else {
-			retVal, err = dao.UpdateSensitiveWord(word, params.ID, params.Ctx.GetUserName(), "id", "word", "vendor_id", "last_operator")
+			retVal, err = dao.UpdateSensitiveWord(word, params.VendorID, params.ID, params.Ctx.GetUserName(), "id", "word", "vendor_id", "last_operator")
 		}
 		return retVal, "", err
 	})