no message

controllers/activity.go

@@ -465,29 +465,32 @@ func (this *ActivityCoAntroller) Detail() {
 		//处理音频回放
 		var mapActivityId []int
 		mapActivityId = append(mapActivityId, activityId)
-		mapActivityVoice, err := services.GetActivityVoiceResp(mapActivityId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
-			return
-		}
-		if mapActivityVoice[activityId] != nil {
-			activityInfo.FileType = 1
-			activityInfo.AudioLink = true
-			activityInfo.VoiceList = mapActivityVoice[activityId]
-		}
 
-		//处理视频回放
-		mapActivityVideo, err := services.GetActivityVideoResp(mapActivityId)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "GetActivityVideoResp，Err:" + err.Error()
-			return
-		}
-		if mapActivityVideo[activityId] != nil {
-			activityInfo.FileType = 2
-			activityInfo.AudioLink = true
-			activityInfo.VideoDetail = mapActivityVideo[activityId]
+		if activityInfo.ChartPermissionId != utils.CHART_PERMISSION_ID_YANXUAN { // 研选的音视频不在查研展示
+			mapActivityVoice, err := services.GetActivityVoiceResp(mapActivityId)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error() + "activityId：" + strconv.Itoa(activityId)
+				return
+			}
+			if mapActivityVoice[activityId] != nil {
+				activityInfo.FileType = 1
+				activityInfo.AudioLink = true
+				activityInfo.VoiceList = mapActivityVoice[activityId]
+			}
+
+			//处理视频回放
+			mapActivityVideo, err := services.GetActivityVideoResp(mapActivityId)
+			if err != nil {
+				br.Msg = "获取信息失败"
+				br.ErrMsg = "GetActivityVideoResp，Err:" + err.Error()
+				return
+			}
+			if mapActivityVideo[activityId] != nil {
+				activityInfo.FileType = 2
+				activityInfo.AudioLink = true
+				activityInfo.VideoDetail = mapActivityVideo[activityId]
+			}
 		}
 		//8.5 小程序活动详情页 除专家电话外 其余属于新产业的活动 ，不显示 new 标签
 		if activityInfo.ActivityTypeName != "专家电话会" {

controllers/home.go

@@ -671,7 +671,7 @@ func (this *HomeController) NewList() {
 	//	condition += `  AND IF ( source = 'activity' , source_id  NOT IN (` + utils.GetOrmInReplace(lenyiDongactivityIds) + `) ,1=1 ) `
 	//	pars = append(pars, yiDongactivityIds)
 	//} else {
-	condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx') ` + conditionInit
+	condition += ` AND source NOT IN ('activity','activityspecial','newchart','industrialsourceHz','industrialsourceYx')   AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 )  ` + conditionInit
 	//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
 	conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
 	if err != nil && err.Error() != utils.ErrNoRow() {

services/es_comprehensive.go

@@ -1556,7 +1556,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	keyWord = "%" + keyWord + "%"
 	var conditionTitle string
 	var parsTitle []interface{}
-	conditionTitle = " AND search_title LIKE ? "
+	conditionTitle = " AND search_title LIKE ? AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsTitle = append(parsTitle, keyWord)
 	totalTitle, e := models.GetResourceDataCount(conditionTitle, parsTitle)
 	if e != nil {
@@ -1567,7 +1567,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	var conditionContent string
 	var parsContent []interface{}
 
-	conditionContent = " AND search_content LIKE ? AND search_title  NOT LIKE ?  "
+	conditionContent = " AND search_content LIKE ? AND search_title  NOT LIKE ?  AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 ) "
 	parsContent = append(parsContent, keyWord, keyWord)
 	totalContent, e := models.GetResourceDataCount(conditionContent, parsContent)
 	if e != nil {
@@ -1577,11 +1577,10 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	var searchTotal int
 	searchTotal = (startSize/pageSize + 1) * pageSize
 	var list []*models.CygxResourceData
-	fmt.Println("totalTitle", totalTitle)
-	fmt.Println("totalContent", totalContent)
-	fmt.Println(searchTotal)
+	//fmt.Println("totalTitle", totalTitle)
+	//fmt.Println("totalContent", totalContent)
+	//fmt.Println(searchTotal)
 	if totalTitle >= searchTotal {
-		fmt.Println("1")
 		//全部都是标题搜索
 		list, e = models.GetResourceDataListCondition(conditionTitle, parsTitle, startSize, pageSize)
 		if e != nil && e.Error() != utils.ErrNoRow() {
@@ -1589,7 +1588,6 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 			return
 		}
 	} else if totalTitle <= searchTotal-pageSize {
-		fmt.Println("2")
 		//全部都是内容搜索
 		startSize = startSize - totalTitle
 
@@ -1599,9 +1597,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 			return
 		}
 	} else {
-		fmt.Println("3")
 		//一半标题搜索，一半内容搜索
-
 		list, e = models.GetResourceDataListCondition(conditionTitle, parsTitle, startSize, pageSize)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetResourceDataListCondition, Err: " + e.Error())

services/micro_roadshow.go

@@ -384,10 +384,10 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		conditionAskserie += ` AND a.chart_permission_id IN (` + chartPermissionIds + `)`
 	}
 	//发布状态
-	audioAct += ` AND  b.publish_status = 1 `
-	videoAct += ` AND  b.publish_status = 1 `
-	videoMico += ` AND  a.publish_status = 1 `
-	conditionAskserie += ` AND  a.publish_status = 1 `
+	audioAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31 `
+	videoAct += ` AND  b.publish_status = 1  AND  b.chart_permission_id  != 31 `
+	videoMico += ` AND  a.publish_status = 1 AND  a.chart_permission_id  != 31 `
+	conditionAskserie += ` AND  a.publish_status = 1  AND  a.chart_permission_id  != 31 `
 
 	total, videoList, e = models.GetMicroRoadShowVideoPageListV12(startSize, pageSize, audioAct, audioActPars, videoAct, videoActPars, videoMico, videoMicoPars, conditionAskserie, askseriePars)
 	if e != nil {