|
@@ -580,12 +580,13 @@ func (this *MobileHomeController) NewList() {
|
|
|
// }
|
|
|
//}
|
|
|
|
|
|
- if lenActivityIds > 0 && tagIds == "" {
|
|
|
+ //if lenActivityIds > 0 && tagIds == "" {
|
|
|
+ if lenActivityIds > 0 {
|
|
|
condition += ` OR ( source = 'activity' AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) ` + conditionInit + ` ) `
|
|
|
pars = append(pars, activityIds)
|
|
|
}
|
|
|
|
|
|
- if lenActivityspecialIds > 0 && tagIds == "" {
|
|
|
+ if lenActivityspecialIds > 0 {
|
|
|
condition += ` OR ( source = 'activityspecial' AND source_id IN (` + utils.GetOrmInReplace(lenActivityspecialIds) + `) ` + conditionInit + ` ) `
|
|
|
pars = append(pars, activityspecialIds)
|
|
|
}
|