diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 98e356684..f3b3b6e34 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(3) + wordList, err := dao.GetSensitiveWordList(-1) 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 fd7c2544e..344ee5c55 100644 --- a/business/model/dao/sensitive_words.go +++ b/business/model/dao/sensitive_words.go @@ -7,12 +7,12 @@ import ( "time" ) -/*VendorID = 2 的时候是通用,3 查询所有,保留之前的1,看后面会不会有扩展*/ +/*VendorID = -2 的时候是通用,-1 查询所有,保留之前的1,看后面会不会有扩展*/ func GetSensitiveWordList(vendorID int) (wordList []*model.SensitiveWord, err error) { if vendorID == 0 { - vendorID = 2 + vendorID = -2 } - if vendorID == 3 { + if vendorID == -1 { sql := `SELECT * FROM sensitive_word WHERE deleted_at = ?` err = GetRows(nil, &wordList, sql, utils.DefaultTimeValue) } else { @@ -24,7 +24,7 @@ func GetSensitiveWordList(vendorID int) (wordList []*model.SensitiveWord, err er func InsertSensitiveWord(word string, vendorID int, userName string) error { if vendorID == 0 { - vendorID = 2 + vendorID = -2 } sensitiveWord := &model.SensitiveWord{Word: word, VendorID: vendorID} WrapAddIDCULDEntity(sensitiveWord, userName) @@ -36,7 +36,7 @@ func DeleteSensitiveWord(wordList *model.SensitiveWord, id int, userName string, return nil, errors.New("入参错误,找不到相应ID") } if vendorID == 0 { - vendorID = 2 + vendorID = -2 } wordList.ID = id wordList.VendorID = id @@ -53,7 +53,7 @@ func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, us return nil, errors.New("入参错误,找不到相应ID") } if vendorID == 0 { - vendorID = 2 + vendorID = -2 } wordList.ID = id wordList.VendorID = vendorID