no message

controllers/activity.go

@@ -1909,43 +1909,6 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		br.ErrMsg = "获取失败，Err:" + errList.Error()
 		return
 	}
-	//if keyWord != "" {
-	//	keyWordArr, err := services.GetIndustryMapNameSliceV3(keyWord)
-	//	if err != nil {
-	//		br.Msg = "获取失败"
-	//		br.ErrMsg = "获取分词失败,GetIndustryMapNameSliceV3 Err: " + err.Error()
-	//		return
-	//	}
-	//	keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
-	//
-	//	startSizeIk := utils.StartIndex(currentIndex, pageSize)
-	//	startSizeIk = startSizeIk - total
-	//	if startSizeIk < 0 {
-	//		startSizeIk = 0
-	//	}
-	//	var pageSizeIk int
-	//	pageSizeIk = pageSize - len(list)
-	//	if pageSizeIk > 0 {
-	//		//搜索关键词联想
-	//		conditionActivityIk, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 2)
-	//		if err != nil {
-	//			br.Msg = "获取失败"
-	//			br.ErrMsg = "获取失败，Err:" + err.Error()
-	//			return
-	//		}
-	//		conditionActivityIk += condition + conditionOrder
-	//		listIk, errList := models.GetActivityListNew(conditionActivityIk, pars, uid, startSizeIk, pageSizeIk, playBack, filter, typeName)
-	//		if errList != nil {
-	//			br.Msg = "获取失败"
-	//			br.ErrMsg = "获取失败，Err:" + errList.Error()
-	//			return
-	//		}
-	//
-	//		for _, item := range listIk {
-	//			list = append(list, item)
-	//		}
-	//	}
-	//}
 
 	var isShow bool
 	isShow = services.GetShowSustainable()

services/activity.go

@@ -1235,7 +1235,7 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 	if userType == 3 {
 		condition += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
 	}
-	condition += `    AND  art.is_limit_people = 0  `
+	condition += `    AND  art.is_limit_people = 1  `
 	conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
 	return
 }
@@ -2236,11 +2236,6 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 		articleDetail.IsShowDetails = true
 		return
 	}
-	//扣点的研选活动只展示我要报名
-	if articleDetail.IsResearchPoints {
-		articleDetail.IsShowSignup = true
-		return
-	}
 
 	//专家电话会 1
 	if articleDetail.ActivityTypeId == 1 && articleDetail.IsLimitPeople == 0 && (articleDetail.ActiveState == "1" || articleDetail.ActiveState == "2") {
@@ -2280,11 +2275,11 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 
 		//公司调研电话会 3
 		if articleDetail.ActivityTypeId == 3 {
-			if articleDetail.LimitPeopleNum == 0 {
+			if articleDetail.IsResearchPoints || articleDetail.LimitPeopleNum > 0 {
+				articleDetail.IsShowSignup = true
+			} else {
 				articleDetail.IsShowMeetingReminder = true
 				articleDetail.IsShowOutboundCall = true
-			} else {
-				articleDetail.IsShowSignup = true
 			}
 		}
 
@@ -2376,7 +2371,7 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
 		return
 	}
 	for k := range articNewLabel {
-		labelMap[k] = false
+		labelMap[k] = true
 	}
 
 	return