fix

controllers/home.go

@@ -388,7 +388,11 @@ func (this *MobileHomeController) NewList() {
 		var conditionOrder string
 		conditionOrder = ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
 		conditionActivity += conditionOrder
-		listActivity, err := models.GetActivityListHomeNew(conditionActivity, 0, 2000)
+		actPageSize := 200
+		if tagIds != "" {
+			pageSize = 2000
+		}
+		listActivity, err := models.GetActivityListHomeNew(conditionActivity, 0, actPageSize)
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取可见活动数据失败，Err:" + err.Error()

models/article.go

@@ -327,7 +327,7 @@ func GetCygxArticleCount(condition string, pars []interface{}) (count int, err e
 }
 
 // 列表
-func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, industryStr, subjectNameStr string) (artIds,actIds string, err error) {
+func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, industryStr, subjectNameStr string) (artIds, actIds string, err error) {
 	o := orm.NewOrm()
 	artSql := `SELECT GROUP_CONCAT(DISTINCT art.article_id SEPARATOR ',') AS art_ids FROM cygx_article as art `
 
@@ -346,33 +346,29 @@ func GetCygxCygxArticleListByCondition(articleTypesCond, activityTypesCond, indu
 				INNER JOIN cygx_industrial_subject AS cis ON cis.industrial_subject_id=ias.industrial_subject_id  `
 	}
 	artSql += ` WHERE 1=1 `
-	if articleTypesCond != "" {
-		if  industryStr != ""  && subjectNameStr != "" {
-			artSql += articleTypesCond + ` AND (im.industry_name In (`+ industryStr +`) OR cis.subject_name In (`+ subjectNameStr +`) )`
-		} else if industryStr == ""  && subjectNameStr != "" {
-			artSql += articleTypesCond + ` AND  cis.subject_name In (`+ subjectNameStr +`) `
-		} else if industryStr != ""  && subjectNameStr == "" {
-			artSql += articleTypesCond + ` AND im.industry_name In (`+ industryStr +`) `
-		} else {
-			artSql += articleTypesCond
-		}
-		err = o.Raw(artSql).QueryRow(&artIds)
-	}
 
+	if industryStr != "" && subjectNameStr != "" {
+		artSql += articleTypesCond + ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
+	} else if industryStr == "" && subjectNameStr != "" {
+		artSql += articleTypesCond + ` AND  cis.subject_name In (` + subjectNameStr + `) `
+	} else if industryStr != "" && subjectNameStr == "" {
+		artSql += articleTypesCond + ` AND im.industry_name In (` + industryStr + `) `
+	} else {
+		artSql += articleTypesCond
+	}
+	err = o.Raw(artSql).QueryRow(&artIds)
 
 	actSql += ` WHERE 1=1 `
-	if activityTypesCond != "" {
-		if  industryStr != ""  && subjectNameStr != "" {
-			actSql += activityTypesCond + ` AND (im.industry_name In (`+ industryStr +`) OR cis.subject_name In (`+ subjectNameStr +`) )`
-		} else if industryStr == ""  && subjectNameStr != "" {
-			actSql += activityTypesCond + ` AND  cis.subject_name In (`+ subjectNameStr +`) `
-		} else if industryStr != ""  && subjectNameStr == "" {
-			actSql += activityTypesCond + ` AND im.industry_name In (`+ industryStr +`) `
-		} else {
-			actSql += activityTypesCond
-		}
-		err = o.Raw(actSql).QueryRow(&actIds)
+	if industryStr != "" && subjectNameStr != "" {
+		actSql += activityTypesCond + ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
+	} else if industryStr == "" && subjectNameStr != "" {
+		actSql += activityTypesCond + ` AND  cis.subject_name In (` + subjectNameStr + `) `
+	} else if industryStr != "" && subjectNameStr == "" {
+		actSql += activityTypesCond + ` AND im.industry_name In (` + industryStr + `) `
+	} else {
+		actSql += activityTypesCond
 	}
+	err = o.Raw(actSql).QueryRow(&actIds)
 
 	return
-}
+}