|
|
@@ -502,6 +502,7 @@ func GetHavePower(activityInfo *models.ActivityDetail, permissionStr, companyDet
|
|
|
// @Param KeyWord query string false "搜索关键词 多个用 , 隔开"
|
|
|
// @Param ikType query int false "联想词类型 ， 1不做联想，2，做除初始词的联想，3所有联想"
|
|
|
func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermissionIds, whichDay, activeState, label string, isPower, source int, keyWord string, playBack, ikType int) (conditionActivity string, err error) {
|
|
|
+ keyWordNoIk := keyWord
|
|
|
adminIds, err := models.GetSelleridWhichGroup(user.CompanyId, 2)
|
|
|
if err != nil {
|
|
|
return
|
|
|
@@ -632,12 +633,12 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
|
|
|
if len(keyWordArr) > 1 {
|
|
|
if ikType == 2 {
|
|
|
keyWord = KeyWordArrSqlRegexp(keyWordArr)
|
|
|
+ condition += ` AND (art.label NOT LIKE '%` + keyWordNoIk + `%' AND art.activity_name NOT LIKE '%` + keyWordNoIk + `%' ) `
|
|
|
} else if ikType == 3 {
|
|
|
keyWord = KeyWordArrSqlRegexpAll(keyWordArr)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
condition += ` AND (art.label REGEXP '` + keyWord + `' OR art.activity_name REGEXP '` + keyWord + `' ) `
|
|
|
} else {
|
|
|
if activeState != "" {
|
xingzai