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