no message

controllers/activity.go

@@ -1623,12 +1623,13 @@ func (this *ActivityController) ActivityListSearch() {
 		condition += ` AND art.yidong_activity_id = '' `
 	}
 	condition += ` AND art.is_limit_people = 1 AND art.publish_status = 1 ` + conditionActivity
-	listActivity, total, err := services.GetActivitySpecialSearcheList(user, condition, startSize, pageSize, keyWord)
+	listActivity, total, err := services.GetActivitySpecialSearcheList(user, condition, startSize, pageSize, playBack, keyWord)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	//return
 
 	//用户权限
 	authInfo, permissionArr, e := services.GetUserRaiPermissionInfo(user.UserId, user.CompanyId)

services/activity_special.go

@@ -542,7 +542,7 @@ func HandleActivitySpecialShow(activityDetail *models.CygxActivitySpecialDetail,
 
 // 活动与专项调研搜索 GetActivitySpecialSearcheList
 // 活动与专项调研搜索 GetActivitySpecialSearcheList
-func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, startSize, pageSize int, keywords string) (items []*models.ActivityDetail, total int, err error) {
+func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, startSize, pageSize, playBack int, keywords string) (items []*models.ActivityDetail, total int, err error) {
 	var conditionSpecil string
 	var pars, parsSpecil []interface{}
 	keyword := keywords
@@ -551,14 +551,18 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
 		conditionSpecil += ` AND art.days > 0 AND (art.research_theme LIKE ? OR art.label LIKE ? OR art.industrial_name LIKE ? OR art.industrial_subject_name LIKE ? ) `
 		parsSpecil = append(parsSpecil, keywords, keywords, keywords, keywords)
 	}
+	if playBack == 1 {
+		conditionSpecil += `  AND art.activity_id = 0  `
+	}
 	list, totalSearche, e := models.GetActivitySpecialSearcheList(condition, pars, conditionSpecil, parsSpecil, startSize, pageSize)
 	if e != nil {
 		err = errors.New("GetActivitySpecialSearcheList, Err: " + e.Error())
 		return
 	}
+	//return
 
 	// 查询IK分词后那一部分的数据
-	conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keyword, 0, 2)
+	conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keyword, playBack, 2)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetActivityonditionList, Err: " + e.Error())
 		return
@@ -570,6 +574,8 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
 		err = errors.New("GetActivityonditionList, Err: " + e.Error())
 		return
 	}
+	//return
+	fmt.Println("totalIk", totalIk)
 	total = totalSearche + totalIk
 	keyWordArr, e := GetIndustryMapNameSliceV3(keywords)
 	if e != nil {