no message

controllers/activity.go

@@ -1908,16 +1908,23 @@ func (this *ActivityController) ActivityListSearch() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
 	//活动可见限制
-	conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "3", "", 0, 1, keyWord, playBack, 1)
+	//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, "", 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
-	if source == 1 {
-		condition += ` AND art.yidong_activity_id = '' `
-	}
-	condition += ` AND art.is_limit_people = 1 AND art.publish_status = 1 ` + conditionActivity
+	condition += ` AND art.publish_status = 1 ` + conditionActivity
 	listActivity, total, err := services.GetActivitySpecialSearcheList(user, condition, startSize, pageSize, playBack, keyWord)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -1978,6 +1985,7 @@ func (this *ActivityController) ActivityListSearch() {
 		item.IsLimitPeople = v.IsLimitPeople
 		item.IsResearchPoints = v.IsResearchPoints
 		item.SiginupDeadline = v.SiginupDeadline
+		item.IsYidongActivity = v.IsYidongActivity
 		// 判断是否属于研选类型的活动
 		if strings.Contains(v.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 			item.IsResearch = true

models/resource_data.go

@@ -47,6 +47,7 @@ type CygxResourceDataResp struct {
 	IsLimitPeople           int    `description:"是否限制人数 1是，0否"`
 	IsShowDetails           bool   `description:"是否展示查看详情按钮"`
 	YidongActivityUrl       string `description:"易董活动跳转地址"`
+	IsYidongActivity        bool   `description:"是否属于易董同步过来的活动"`
 	TripStatus              int    `description:"行程进行状态 1：预报名，2：确定行程"`
 	IsTrip                  int    `description:"确定行程是否报名 1是 ，0 否"`
 	ActivityTimeText        string `description:"活动预期时间带文字"`

services/activity_button.go

@@ -330,6 +330,7 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 			if yidongLongLink != "" {
 				activityDetail.YidongActivityUrl = yidongLongLink + "%26source=11%26fromHz=true%26tgc=" + ydTgc
 			}
+			activityDetail.IsYidongActivity = true
 		}
 	} else {
 		//专家电话会 1

services/es_comprehensive.go

@@ -481,9 +481,11 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			return
 		}
 		var activityListRersp []*models.ActivityListResp
-		for _, v := range activityList {
-			activityListRersp = append(activityListRersp, ActivityButtonShow(v, user, make([]string, 0)))
-		}
+		//for _, v := range activityList {
+		//	activityListRersp = append(activityListRersp, ActivityButtonShow(v, user, make([]string, 0)))
+		//}
+		//var pArr []string
+		activityListRersp = ActivityArrButtonShow(activityList, user, make([]string, 0))
 		//处理不同的报名方式按钮回显
 		mapActivitySignup, e := GetActivitySignupResp(activityIds, user)
 		if e != nil {

services/resource_data.go

@@ -209,8 +209,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		//for _, v := range activityList {
 		//	activityListRersp = append(activityListRersp, ActivityButtonShow(v, user, make([]string, 0)))
 		//}
-		var pArr []string
-		activityListRersp = ActivityArrButtonShow(activityList, user, pArr)
+		activityListRersp = ActivityArrButtonShow(activityList, user, make([]string, 0))
 		//处理不同的报名方式按钮回显
 		mapActivitySignup, e := GetActivitySignupResp(activityIds, user)
 		if e != nil {