Merge branch 'cygx_8.7' into debug

controllers/activity.go

@@ -2577,6 +2577,22 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		return
 	}
 
+	if typeName != ""{
+		typeSlice := strings.Split(typeName, ",")
+		tempCondition := ""
+		for _, s := range typeSlice {
+			if s == "1"{
+				tempCondition += "'专家电话会',"
+			} else if s == "2" {
+				tempCondition += "'分析师电话会',"
+			} else if s == "1,2" {
+				tempCondition += "'专家电话会','分析师电话会',"
+			}
+		}
+		tempCondition = strings.TrimRight(tempCondition, ",")
+		condition += ` AND art.activity_type_name IN (` + tempCondition + `)`
+	}
+
 	var conditionOrder string
 	if activeState == "2" || activeState == "3" {
 		conditionOrder = ` ORDER BY art.activity_time DESC  `
@@ -2596,22 +2612,6 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 
 	condition += conditionOrder
 
-	if typeName != ""{
-		typeSlice := strings.Split(typeName, ",")
-		tempCondition := ""
-		for _, s := range typeSlice {
-			if s == "1"{
-				tempCondition += "'专家电话会',"
-			} else if s == "2" {
-				tempCondition += "'分析师电话会',"
-			} else if s == "1,2" {
-				tempCondition += "'专家电话会','分析师电话会',"
-			}
-		}
-		tempCondition = strings.TrimRight(tempCondition, ",")
-		condition += ` AND art.activity_type_name IN (` + tempCondition + `)`
-	}
-
 	list, errList := models.GetActivityListNew(condition, pars, uid, startSize, pageSize, playBack, filter)
 	if errList != nil {
 		br.Msg = "获取失败"