浏览代码

no message

xingzai 1 年之前
父节点
当前提交
41bbbace94
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5 4
      services/micro_roadshow.go

+ 5 - 4
services/micro_roadshow.go

@@ -343,13 +343,14 @@ func GetMicroRoadShowPageListV12(pageSize, currentIndex, sourceId, tableType int
 		// @Param   SearchType	string	int		true	"搜索类型: 1-路演回放; 2-问答系列; 3-调研反馈   多个用 , 隔开"
 		// @Param   SearchType	string	int		true	"搜索类型: 1-路演回放; 2-问答系列; 3-调研反馈   多个用 , 隔开"
 		videoMico += ` AND a.chart_permission_id  = 0 ` // 产业视频不在搜索范围内
 		videoMico += ` AND a.chart_permission_id  = 0 ` // 产业视频不在搜索范围内
 		if strings.Contains(searchType, "1") && !strings.Contains(searchType, "3") {
 		if strings.Contains(searchType, "1") && !strings.Contains(searchType, "3") {
-			audioAct += ` AND b.activity_type_id IN (2,7)  AND b.yidong_activity_id_by_cygx != '' `
-			videoAct += ` AND b.activity_type_id IN (2,7)  AND b.yidong_activity_id_by_cygx != ''  `
+			audioAct += ` AND b.activity_type_id IN (2,7)  AND b.is_yidong_conduct = 1 `
+			videoAct += ` AND b.activity_type_id IN (2,7)  AND b.is_yidong_conduct = 1 `
 		}
 		}
 
 
 		if !strings.Contains(searchType, "1") && strings.Contains(searchType, "3") {
 		if !strings.Contains(searchType, "1") && strings.Contains(searchType, "3") {
-			audioAct += ` AND IF (	b.activity_type_id NOT IN (2,7) ,  b.yidong_activity_id_by_cygx != '', 1 = 1 )`
-			videoAct += ` AND IF (	b.activity_type_id NOT IN (2,7) ,  b.yidong_activity_id_by_cygx != '', 1 = 1 )  `
+
+			audioAct += ` AND  (    b.is_yidong_conduct = 0   OR 	b.activity_type_id   NOT  IN (2,7) )  `
+			videoAct += ` AND  (     b.is_yidong_conduct = 0  OR 	b.activity_type_id   NOT  IN (2,7) )  `
 		}
 		}
 
 
 		if !strings.Contains(searchType, "2") {
 		if !strings.Contains(searchType, "2") {