xingzai 5 mesiacov pred
rodič
commit
8256e1630c

+ 1 - 1
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')   AND IF   ( source IN('activityvoice','activityvideo') , chart_permission_id != 31 ,1=1 )  ` + conditionInit
+	condition += ` AND  is_hide = 0  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() {

+ 2 - 2
models/activity_video.go

@@ -58,7 +58,7 @@ type CygxActivityVideoListRep struct {
 // 列表
 func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
+	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  AND  v.is_hide = 0  `
 	if condition != "" {
 		sql += condition
 	}
@@ -124,7 +124,7 @@ func GetActivityVideoActivityIds() (activityIds string, err error) {
 	sql := `SELECT
 				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
 			FROM
-				cygx_activity_video AS a `
+				cygx_activity_video AS a  WHERE  is_hide = 0 `
 	o := orm.NewOrm()
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return

+ 2 - 2
models/activity_voice.go

@@ -64,7 +64,7 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 			cygx_activity_voice AS v
 			INNER JOIN cygx_activity AS a ON a.activity_id = v.activity_id 
 		WHERE
-			1 = 1 	 AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
+			1 = 1  AND  v.is_hide = 0  	 AND  v.activity_id IN (` + utils.GetOrmInReplace(lenactivityIds) + `)  `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, activityIds).QueryRows(&items)
 	return
@@ -132,7 +132,7 @@ func GetActivityVoiceActivityIds() (activityIds string, err error) {
 	sql := `SELECT
 				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
 			FROM
-				cygx_activity_voice AS a `
+				cygx_activity_voice AS a  WHERE  is_hide = 0  `
 	o := orm.NewOrm()
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return

+ 2 - 2
services/micro_roadshow.go

@@ -384,8 +384,8 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		conditionAskserie += ` AND a.chart_permission_id IN (` + chartPermissionIds + `)`
 	}
 	//发布状态
-	audioAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31 `
-	videoAct += ` AND  b.publish_status = 1  AND  b.chart_permission_id  != 31 `
+	audioAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31  AND  a.is_hide = 0 `
+	videoAct += ` AND  b.publish_status = 1 AND  b.chart_permission_id  != 31  AND  a.is_hide = 0 `
 	videoMico += ` AND  a.publish_status = 1 AND  a.chart_permission_id  != 31 `
 	conditionAskserie += ` AND  a.publish_status = 1  AND  a.chart_permission_id  != 31 `