Merge branch 'cygx_8.7' into debug

controllers/activity.go

@@ -2577,21 +2577,7 @@ 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" {
@@ -2612,7 +2598,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 
 	condition += conditionOrder
 
-	list, errList := models.GetActivityListNew(condition, pars, uid, startSize, pageSize, playBack, filter)
+	list, errList := models.GetActivityListNew(condition, pars, uid, startSize, pageSize, playBack, filter, typeName)
 	if errList != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + errList.Error()

models/activity.go

@@ -1015,7 +1015,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 }
 
 //列表
-func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pageSize, playBack, filter int) (items []*ActivityDetail, err error) {
+func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pageSize, playBack, filter int, typeName string) (items []*ActivityDetail, err error) {
 	var sqlJiontable string
 	if playBack == 1 {
 		//sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
@@ -1039,6 +1039,22 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 		sql += condition
 	}
 	sql += ` LIMIT ?,?`
+
+	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, ",")
+		sql = `SELECT * FROM(` + sql + `) AS t WHERE t.activity_type_name IN (` + tempCondition + `)`
+	}
 	_, err = o.Raw(sql, pars, uid, uid, uid, startSize, pageSize).QueryRows(&items)
 	return
 }