ziwen 1 yıl önce
ebeveyn
işleme
47267f1bfb
1 değiştirilmiş dosya ile 8 ekleme ve 2 silme
  1. 8 2
      controllers/home.go

+ 8 - 2
controllers/home.go

@@ -411,7 +411,10 @@ func (this *MobileHomeController) NewList() {
 			activityIds = append(activityIds, v.ActivityId)
 		}
 		lenActivityIds := len(activityIds)
-		if lenActivityIds > 0 {
+		if lenActivityIds > 0 && tagIds != "" {
+			condition += ` AND ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` )    `
+			pars = append(pars, activityIds)
+		} else if lenActivityIds > 0 {
 			condition += ` OR ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` )    `
 			pars = append(pars, activityIds)
 		}
@@ -428,7 +431,10 @@ func (this *MobileHomeController) NewList() {
 			activityspecialIds = append(activityspecialIds, v.ActivityId)
 		}
 		lenActivityspecialIds := len(activityspecialIds)
-		if lenActivityspecialIds > 0 {
+		if lenActivityspecialIds > 0  && tagIds != "" {
+			condition += ` AND ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
+			pars = append(pars, activityspecialIds)
+		} else if lenActivityspecialIds > 0 {
 			condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` )   `
 			pars = append(pars, activityspecialIds)
 		}