瀏覽代碼

专项产业调研已结束活动搜索

xingzai 2 年之前
父節點
當前提交
46ed88f14b
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 2 2
      controllers/activity.go
  2. 2 1
      services/activity_special.go

+ 2 - 2
controllers/activity.go

@@ -1733,8 +1733,8 @@ func (this *ActivityController) ActivityListSearch() {
 		}
 		list = append(list, item)
 	}
-	if len(resp.List) == 0 {
-		resp.List = make([]*models.CygxResourceDataResp, 0)
+	if len(list) == 0 {
+		list = make([]*models.CygxResourceDataResp, 0)
 	}
 	//添加活动搜索记录
 	if keyWord != "" {

+ 2 - 1
services/activity_special.go

@@ -221,7 +221,7 @@ func GetActivityLabelSpecialList(user *models.WxUserItem, conditionActivitySpeci
 		return
 	}
 	//if len(specialList) < 80 {
-	conditionNoTrip += ` AND art.days = 0  `
+	//conditionNoTrip += ` AND art.days = 0  `
 	var conditionShengjiNoTrip string
 	var conditionZhengshiNoTrip string
 	var conditionHangYeNoTrip string
@@ -746,6 +746,7 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
 	if playBack == 1 {
 		conditionSpecil += `  AND art.activity_id = 0  `
 	}
+	conditionSpecil += `  AND art.publish_status = 1  `
 	list, totalSearche, e := models.GetActivitySpecialSearcheList(condition, pars, conditionSpecil, parsSpecil, startSize, pageSize)
 	if e != nil {
 		err = errors.New("GetActivitySpecialSearcheList, Err: " + e.Error())