no message

controllers/home.go

@@ -311,8 +311,8 @@ func (this *MobileHomeController) NewList() {
 		if labelKeyword == "" {
 			//查询近一个月的数据
 			condition += " AND search_order_time  >   '" + time.Now().AddDate(0, 0, -180).Format(utils.FormatDateTime) + "'"
-			yanxuanActivityIds = services.GetYanxuanActivityIds(user, 1) // 获取所有的研选活动ID
-			yanxuanArticleIds = services.GetYanxuanArticleIds()          //获取所有研选文章ID
+			yanxuanActivityIds = services.GetYanxuanActivityIds(user, "1,2") // 获取所有的研选活动ID
+			yanxuanArticleIds = services.GetYanxuanArticleIds()              //获取所有研选文章ID
 		} else {
 			yanxuanActivityIds, yanxuanArticleIds, err = services.GetConditionInitByTagIds(user, labelKeyword)
 			if err != nil {

services/activity.go

@@ -1883,7 +1883,7 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 }
 
 // GetYanxuanActivityIds 获取研选活动ID
-func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityIds []int) {
+func GetYanxuanActivityIds(user *models.WxUserItem, activeState string) (activityIds []int) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -1894,8 +1894,8 @@ func GetYanxuanActivityIds(user *models.WxUserItem, activeState int) (activityId
 	var condition string
 	var pars []interface{}
 	condition = `  AND  chart_permission_id  = 31  AND yidong_activity_id = '' AND art.publish_status = 1  `
-	if activeState > 0 {
-		condition += ` AND  active_state =    ` + strconv.Itoa(activeState)
+	if activeState != "" {
+		condition += ` AND  active_state IN  (` + activeState + `)   `
 
 	}
 	//pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)

services/es_comprehensive.go

@@ -594,8 +594,8 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 }
 
 func SqlComprehensiveSearch(user *models.WxUserItem, keyWord string, startSize, pageSize int) (result []*SearchComprehensiveItem, total int, err error) {
-	yanxuanActivityIds := GetYanxuanActivityIds(user, 0) // 获取所有的研选活动ID
-	yanxuanArticleIds := GetYanxuanArticleIds()          //获取所有研选文章ID
+	yanxuanActivityIds := GetYanxuanActivityIds(user, "") // 获取所有的研选活动ID
+	yanxuanArticleIds := GetYanxuanArticleIds()           //获取所有研选文章ID
 	yanxuanArticleIds = append(yanxuanArticleIds, 0)
 	yanxuanActivityIds = append(yanxuanActivityIds, 0)
 

services/tag.go

@@ -52,9 +52,9 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 	var pars []interface{}
 	switch labelKeyword {
 	case utils.LABEL_L1_1: // 全部活动
-		yanxuanActivityIds = GetYanxuanActivityIds(user, 1) // 获取所有的研选活动ID
+		yanxuanActivityIds = GetYanxuanActivityIds(user, "1,2") // 获取所有的研选活动ID
 	case "买方交流": // 买方交流 ->买方线下交流
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 8   AND  active_state = 1 `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 8   AND  active_state IN (1,2) `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -65,7 +65,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 			yanxuanActivityIds = append(yanxuanActivityIds, v.ActivityId)
 		}
 	case "专家调研": // 专家调研->专家电话会+专家线下沙龙
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id IN  (1,5) AND  active_state = 1 `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id IN  (1,5) AND  active_state IN (1,2)  `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -77,7 +77,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 		}
 
 	case "上市公司小范围": // 上市公司小范围->公司调研电话会
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 3  AND  active_state = 1 `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 3  AND  active_state IN (1,2)  `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {