no message

controllers/activity.go

@@ -1716,13 +1716,6 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	isExternalLabel, _ := this.GetInt("IsExternalLabel")   //
 	isResearchPoints, _ := this.GetInt("IsResearchPoints") //
 
-	if isExternalLabel == 1 {
-
-	}
-	if isResearchPoints == 1 {
-
-	}
-
 	if label == "undefined" {
 		label = ""
 	}
@@ -1853,12 +1846,18 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		}
 		conditioninit += ` AND art.activity_id IN ( ` + videoOrVoiceActivityIds + `) `
 	}
-	//是否为外部资源
-	if isExternalLabel == 1 {
-		conditioninit += ` AND art.is_external_label = 1 `
-	}
-	if isResearchPoints == 1 {
-		conditioninit += ` AND art.is_research_points = 1 `
+	//外部资源，研选扣点的并集搜索
+	if isExternalLabel == 1 && isResearchPoints == 1 {
+		conditioninit += ` AND ( art.is_external_label = 1  OR art.is_research_points = 1 )`
+	} else {
+		//是否为外部资源
+		if isExternalLabel == 1 {
+			conditioninit += ` AND art.is_external_label = 1 `
+		}
+		// 是否为研选扣点
+		if isResearchPoints == 1 {
+			conditioninit += ` AND art.is_research_points = 1 `
+		}
 	}
 
 	//活动可见限制

models/activity.go

@@ -461,7 +461,10 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.is_limit_people,
 			1 AS source_type,
 			art.activity_time, 
-			art.city
+			art.city,
+			art.is_external_label,
+			art.siginup_deadline,
+			art.is_research_points
 		FROM
 			cygx_activity AS art
 			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
@@ -493,6 +496,9 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			"",
 			2 AS source_type,
 			art.activity_time,
+			"",
+			"",
+			"",
 			""
 		FROM
 			cygx_activity_special AS art
@@ -1111,7 +1117,10 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.city,
 			1 AS source_type,
 			art.is_yidong_conduct,
-			art.activity_time 
+			art.activity_time,
+			art.is_external_label,
+			art.siginup_deadline,
+			art.is_research_points
 		FROM
 			cygx_activity AS art
 			INNER JOIN cygx_activity_type AS t ON t.activity_type_id = art.activity_type_id
@@ -1143,7 +1152,10 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			"",
 			2 AS source_type,
 			"",
-			art.activity_time 
+			art.activity_time,
+			"",
+			"",
+			""
 		FROM
 			cygx_activity_special AS art
 		WHERE