no message

controllers/activity.go

@@ -127,7 +127,7 @@ func (this *ActivityController) LabelTypeList() {
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
-	condition += `AND art.is_limit_people = 1 ` + conditionActivity
+	condition += ` AND art.is_limit_people = 1 ` + conditionActivity
 	sortTime := ` mintimesort ASC `
 	if activeState == "3" {
 		sortTime = ` timesort DESC  `
@@ -361,6 +361,7 @@ func (this *ActivityController) ActivityListNew() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	//return
 	var conditionOrder string
 	if activeState == "2" || activeState == "3" {
 		conditionOrder = ` ORDER BY art.activity_time DESC  `

services/activity.go

@@ -374,7 +374,7 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 	}
 	var userTypeStr string
 	userTypeStr = mapUserType[userType]
-
+	fmt.Println("userTypeStr", userTypeStr)
 	// 查研观向7.4-始终查询宏观的权限(无论是否有权限)
 	if permissionNameStr == `` {
 		permissionNameStr = `'宏观'`
@@ -447,7 +447,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
 }
@@ -603,6 +603,12 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		articleDetail.IsResearchSpecial = true
 	}
 
+	//司调研电话会(3)、扣点的研选活动只展示我要报名
+	if articleDetail.IsResearchPoints && articleDetail.ActivityTypeId == 3 {
+		articleDetail.IsShowSignup = true
+		return
+	}
+
 	activityTimeText := articleDetail.ActivityTimeText
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
@@ -982,16 +988,16 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		isResearchSpecial = true
 	}
 	//如果是 公司调研电话会：3，或 专家线下沙龙:5  而且  除易董同步过来的以外的研选类型活动，必须要有研选的正式权限
-	if isResearchSpecial {
-		if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_YANXUAN) {
-			//如果连试用权限都没有，那么久按照普通的研选样式展示
-			isResearchSpecial = false
-		}
-		if !strings.Contains(permissionStrZhengShi, activityInfo.ChartPermissionName) {
-			havePower = false
-			return
-		}
-	}
+	//if isResearchSpecial {
+	//	if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_YANXUAN) {
+	//		//如果连试用权限都没有，那么久按照普通的研选样式展示
+	//		isResearchSpecial = false
+	//	}
+	//	if !strings.Contains(permissionStrZhengShi, activityInfo.ChartPermissionName) {
+	//		havePower = false
+	//		return
+	//	}
+	//}
 	//处理决策人可见权限
 	if user.IsMaker == 0 && activityInfo.IsMakerShow == 1 {
 		havePower = false

services/activity_button.go

@@ -309,7 +309,11 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
 	articleDetail.ActivityTimeText = activityTimeText
-
+	//司调研电话会(3)、扣点的研选活动只展示我要报名
+	if articleDetail.IsResearchPoints && articleDetail.ActivityTypeId == 3 {
+		articleDetail.IsShowSignup = true
+		return
+	}
 	articleDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {