no message

controllers/cygx/activity_video.go

@@ -434,6 +434,7 @@ func (this *ActivityVideoCoAntroller) VideoAndVoice() {
 // @Param   KeyWord   query   string  false       "搜索关键词"
 // @Param   SortType          query   string    false		"排序顺序：asc、desc"
 // @Param   SearchType          query   int    false		"类型 1 路演回放 ，2：调研反馈"
+// @Param   IsResearch   query   bool  true       "是否为研选"
 // @Success 200 {object} cygx.CygxActivityVideoListRep
 // @router /activity_voice_and_video/list [get]
 func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
@@ -458,6 +459,7 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 	endDate := this.GetString("EndDate")
 	keyWord := this.GetString("KeyWord")
 	sortType := this.GetString("SortType")
+	isResearch, _ := this.GetBool("IsResearch")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -475,6 +477,13 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 		conditionVideo += ` AND (v.video_name LIKE '%` + keyWord + `%' )  `
 		conditionVoice += ` AND (v.voice_name LIKE '%` + keyWord + `%' )  `
 	}
+
+	if isResearch {
+		chartPermissionId = utils.CHART_PERMISSION_ID_YANXUAN //如果是研选添加一个研选行业的筛选
+	} else {
+		condition += ` AND art.chart_permission_id  != ?  `
+		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
+	}
 	//行业名称
 	if chartPermissionId > 0 {
 		condition += ` AND art.chart_permission_id  = ?  `
@@ -552,7 +561,7 @@ func (this *ActivityVideoCoAntroller) ActivityVoiceAndVideoList() {
 
 		//处理音视文件标识
 		mapVoice := make(map[int]bool)
-		var conditionVoice string
+		//var conditionVoice string
 		var parsVoice []interface{}
 		conditionVoice = " AND activity_id IN (" + activityIds + ")  "
 		listVoice, err := cygx.GetActivityVoiceList(conditionVoice, parsVoice)

controllers/cygx/user_admin_share_history.go

@@ -70,10 +70,10 @@ func (this *UserAdminShareHistoryController) OrderList() {
 	}
 
 	//用户行为搜索
-	if action == "查看专栏" || action == "查看报告" || action == "查看活动" || action == "注册" {
-		condition += " 	AND action = ? "
-		pars = append(pars, action)
-	}
+	//if action == "查看专栏" || action == "查看报告" || action == "查看活动" || action == "注册" {
+	condition += " 	AND action = ? "
+	pars = append(pars, action)
+	//}
 
 	//如果不是权益管理员和admin，就做可见权限限制
 	if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_RAI_ADMIN && sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
@@ -119,7 +119,7 @@ func (this *UserAdminShareHistoryController) OrderList() {
 		switch v.Source {
 		case utils.CYGX_OBJ_ARTICLE: //文章详情
 			v.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
-		case utils.CYGX_OBJ_ACTIVITY: //活动详情
+		case utils.CYGX_OBJ_ACTIVITY, utils.CYGX_OBJ_ACTIVITYVIDEO, utils.CYGX_OBJ_ACTIVITYVOICE: //活动详情
 			v.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
 		case utils.CYGX_OBJ_YANXUANSPECIAL: //研选专栏
 			v.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)