no message

services/activity.go

@@ -621,10 +621,6 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 
 	//有搜索条件传过来时，不判进行状态条件
 	if keyWord != "" {
-		condition += ` AND (art.label  LIKE '%` + keyWord + `%' OR art.activity_name  LIKE '%` + keyWord + `%' ) `
-		if activeState == "2" {
-			condition += ` AND art.active_state  = 2 `
-		}
 		if ikType == 2 || ikType == 3 {
 			keyWordArr, e := GetIndustryMapNameSliceV3(keyWord)
 			if e != nil {
@@ -641,6 +637,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 				}
 			}
 		}
+
 		condition += ` AND (art.label   REGEXP '` + keyWord + `' OR art.activity_name  REGEXP '` + keyWord + `' ) `
 	} else {
 		if activeState != "" {