no message

controllers/micro_roadshow.go

@@ -28,6 +28,7 @@ type MicroRoadShowController struct {
 // @Param   VideoIds			query	string		false	"视频IDs"
 // @Param   ActivityVideoId			query	int		false	"活动视频ID"
 // @Param   Filter			query	string		false	"筛选条件 为空:全部 1:视频 2:音频 3:逻辑解析 4：路演回放 多个用 , 隔开"
+// @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
 // @Success 200 {object} models.HomeListResp
 // @router /list [get]
 func (this *MicroRoadShowController) List() {
@@ -53,6 +54,7 @@ func (this *MicroRoadShowController) List() {
 	activityVideoIds := this.GetString("ActivityVideoIds")
 	activityVideoId, _ := this.GetInt("ActivityVideoId")
 	filter := this.GetString("Filter")
+	chartPermissionIds := this.GetString("ChartPermissionIds")
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
 	}
@@ -74,7 +76,7 @@ func (this *MicroRoadShowController) List() {
 	var total int
 	var e error
 	// 微路演列表
-	list, total, e = services.GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId, filter, keywords, audioIds, videoIds, activityVideoIds)
+	list, total, e = services.GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId, filter, keywords, audioIds, videoIds, activityVideoIds, chartPermissionIds)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取微路演列表失败, Err: " + e.Error()

models/activity.go

@@ -239,6 +239,7 @@ type ActivityDetail struct {
 	ImgUrlBgYx                string                     `description:"研选背景图片"`
 	CancelDeadline            string                     `description:"取消报名截止时间"`
 	ChartPermissionNameDeputy string                     `description:"副行业名称"`
+	TopTime                   int                        `description:"置顶时间"`
 }
 type ListArticleActivity struct {
 	Title   string `description:"文章标题"`

services/activity_signup.go

@@ -42,6 +42,13 @@ func CheckActivitySignUpLimit(user *models.WxUserItem, activityInfo *models.Acti
 			err = errors.New("GetActivitySignupSuccessByUserCountNoHz, Err: " + e.Error())
 			return
 		}
+		if totaSignupPeopleNum == 1 && activityInfo.LimitPeopleNum == 1 {
+			signupStatus = "FullStarffed"
+			popupMsg = "该活动为非公开活动，如有专家访谈需求请联系对口销售"
+			failType = 1
+			return
+		}
+
 		if totaSignupPeopleNum >= activityInfo.LimitPeopleNum {
 			signupStatus = "FullStarffed"
 			popupMsg = "此活动报名人数已满，请留意下期活动"

services/micro_roadshow.go

@@ -165,7 +165,7 @@ func GetHomeNewestList(userId, companyId, startSize, pageSize int, condition str
 }
 
 // GetMicroRoadShowPageList 获取微路演列表添加活动视频 更新与8.1版本
-func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId int, filter, keywords, audioIds, videoIds, activityVideoIds string) (respList []*models.MicroRoadShowPageList, total int, err error) {
+func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activityVideoId int, filter, keywords, audioIds, videoIds, activityVideoIds, chartPermissionIds string) (respList []*models.MicroRoadShowPageList, total int, err error) {
 	var e error
 	// 根据每页数据量获取音视频配比
 	startSize := utils.StartIndex(currentIndex, pageSize)
@@ -204,6 +204,7 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 		idSqlStr = strings.TrimRight(idSqlStr, ",")
 		audioCond += ` AND a.activity_voice_id IN (` + idSqlStr + `)`
 	}
+
 	//}
 	//视频的处理
 	var videoCond string
@@ -273,6 +274,13 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 		videoCond += ` AND video_id IN (` + idSqlStr + `)`
 	}
 	videoCond += ` AND publish_status = 1`
+
+	if chartPermissionIds != "" {
+		videoCond += ` AND chart_permission_id IN (` + chartPermissionIds + `)`
+		audioCond += ` AND b.chart_permission_id IN (` + chartPermissionIds + `)`
+		videoCondAct += ` AND art.chart_permission_id IN (` + chartPermissionIds + `)`
+	}
+
 	//}
 	total, videoList, e = models.GetMicroRoadShowVideoPageListV8(startSize, pageSize, videoCond, videoPars, videoCondAct, videoParsAct, audioCond, audioPars)
 	if e != nil {