no message

controllers/activity.go

@@ -1908,29 +1908,25 @@ func (this *ActivityController) ActivityListSearch() {
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
-	var conditionInit string
-	if keyWord != "" {
-		conditionInit = " AND activity_name LIKE '%" + keyWord + "%' "
-	}
 
 	//活动可见限制
-	//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "3", "", 0, 1, keyWord, playBack, 1)
-	//if err != nil && err.Error() != utils.ErrNoRow() {
-	//	br.Msg = "获取失败"
-	//	br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
-	//	return
-	//}
-
-	if source == 1 {
-		condition += ` AND art.yidong_activity_id = '' `
-	}
-
-	conditionActivity, err := services.ActivityConditioninitSql(user, conditionInit, 0)
+	conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "3", "", 0, 1, keyWord, playBack, 1)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
+
+	if source == 1 {
+		condition += ` AND art.yidong_activity_id = '' `
+	}
+
+	//conditionActivity, err := services.ActivityConditioninitSql(user, conditionInit, 0)
+	//if err != nil && err.Error() != utils.ErrNoRow() {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
+	//	return
+	//}
 	condition += ` AND art.publish_status = 1 ` + conditionActivity
 	listActivity, total, err := services.GetActivitySpecialSearcheList(user, condition, startSize, pageSize, playBack, keyWord)
 	if err != nil {

services/activity.go

@@ -918,13 +918,13 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 			activityDetail.IsShowDetails = true
 			activityDetail.IsYidongActivity = true
 
-			if activityDetail.YidongActivityId != "" {
-				ydTgc, _ := GetYiDongCreateUserInfo(user)
-				yidongLongLink, _ := GetYiDongOriginalLink(activityDetail)
-				if yidongLongLink != "" {
-					yidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
-				}
-			}
+			//if activityDetail.YidongActivityId != "" {
+			//	ydTgc, _ := GetYiDongCreateUserInfo(user)
+			//	yidongLongLink, _ := GetYiDongOriginalLink(activityDetail)
+			//	if yidongLongLink != "" {
+			//		yidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
+			//	}
+			//}
 		} else {
 
 			//专家电话会 1