最新页面C类电话会格式去除

services/activity.go

@@ -706,6 +706,8 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 		condition += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
 	}
 
+	fmt.Println(keyWord)
+	fmt.Println(keyWordNoIk)
 	//有搜索条件传过来时，不判进行状态条件
 	if keyWord != "" {
 		if ikType == 2 || ikType == 3 {
@@ -1739,6 +1741,7 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 		if articleDetail.ActivityTypeId == 7 {
 			articleDetail.IsShowSignup = true
 			articleDetail.IsShowMeetingReminder = true
+			articleDetail.ActivityTypeName = "分析师电话会"
 		}
 	}
 	if articleDetail.SourceType != 2 {

services/activity_special.go

@@ -606,46 +606,47 @@ func GetActivitySpecialSearcheList(user *models.WxUserItem, condition string, st
 		err = errors.New("GetActivitySpecialSearcheList, Err: " + e.Error())
 		return
 	}
-
-	// 查询IK分词后那一部分的数据
-	conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keyword, 0, 2)
-	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetActivityonditionList, Err: " + e.Error())
-		return
-	}
-	conditionActivityIk += " AND art.is_limit_people = 1 AND art.publish_status = 1  "
-
-	totalIk, e := models.GetActivityCount(conditionActivityIk, 0, pars, 0)
-	if e != nil {
-		err = errors.New("GetActivityonditionList, Err: " + e.Error())
-		return
-	}
-	total = totalSearche + totalIk
 	keyWordArr, e := GetIndustryMapNameSliceV3(keywords)
 	if e != nil {
 		err = errors.New("GetActivityonditionList, Err: " + e.Error())
 		return
 	}
-	keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
-	startSizeIk := startSize - totalSearche
-	if startSizeIk < 0 {
-		startSizeIk = 0
-	}
-	var pageSizeIk int
-	pageSizeIk = pageSize - len(list)
-	if pageSizeIk > 0 {
-		//搜索关键词联想
-		conditionActivityIk += ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
-		listIk, e := models.GetActivityListNew(conditionActivityIk, pars, user.UserId, startSizeIk, pageSizeIk, 0, 0, "")
+	var totalIk int
+	if len(keyWordArr) > 1 {
+
+		// 查询IK分词后那一部分的数据
+		conditionActivityIk, e := GetActivityonditionList(user, "", "", "", "", "", 0, 1, keyword, 0, 2)
+		if e != nil && e.Error() != utils.ErrNoRow() {
+			err = errors.New("GetActivityonditionList, Err: " + e.Error())
+			return
+		}
+		conditionActivityIk += " AND art.is_limit_people = 1 AND art.publish_status = 1  "
+		totalIk, e = models.GetActivityCount(conditionActivityIk, 0, pars, 0)
 		if e != nil {
 			err = errors.New("GetActivityonditionList, Err: " + e.Error())
 			return
 		}
-		for _, item := range listIk {
-			list = append(list, item)
+		keyWordArr = RemoveDuplicatesAndEmpty(keyWordArr)
+		startSizeIk := startSize - totalSearche
+		if startSizeIk < 0 {
+			startSizeIk = 0
+		}
+		var pageSizeIk int
+		pageSizeIk = pageSize - len(list)
+		if pageSizeIk > 0 {
+			//搜索关键词联想
+			conditionActivityIk += ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
+			listIk, e := models.GetActivityListNew(conditionActivityIk, pars, user.UserId, startSizeIk, pageSizeIk, 0, 0, "")
+			if e != nil {
+				err = errors.New("GetActivityonditionList, Err: " + e.Error())
+				return
+			}
+			for _, item := range listIk {
+				list = append(list, item)
+			}
 		}
 	}
-
+	total = totalSearche + totalIk
 	items, e = HandleActivityListButton(list, user)
 	if e != nil {
 		err = errors.New("HandleActivityListButton, Err: " + e.Error())