|
@@ -830,6 +830,9 @@ func (this *HomeController) NewList() {
|
|
|
if tagIds != "" {
|
|
|
if tagArticleIds != "" {
|
|
|
condition = ` AND ((source = 'article' AND source_id IN (` + tagArticleIds + `) ) `
|
|
|
+ if mmIds != "" {
|
|
|
+ condition = ` OR ( source = 'meetingreviewchapt' AND source_id IN (` + mmIds + `) ) `
|
|
|
+ }
|
|
|
if tagActivityIds != "" && lenActivityIds > 0 {
|
|
|
condition += ` OR (source = 'activity' AND source_id IN (` + tagActivityIds + `) AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `) )) `
|
|
|
pars = append(pars, activityIds)
|
|
@@ -839,6 +842,9 @@ func (this *HomeController) NewList() {
|
|
|
}
|
|
|
} else if tagActivityIds != "" {
|
|
|
condition = ` AND ((source = 'article' AND source_id IN (0)) `
|
|
|
+ if mmIds != "" {
|
|
|
+ condition = ` OR ( source = 'meetingreviewchapt' AND source_id IN (` + mmIds + `) ) `
|
|
|
+ }
|
|
|
if tagActivityIds != "" && lenActivityIds > 0 {
|
|
|
condition += ` OR (source = 'activity' AND source_id IN (` + tagActivityIds + `) AND source_id IN (` + utils.GetOrmInReplace(lenActivityIds) + `))) `
|
|
|
pars = append(pars, activityIds)
|
|
@@ -846,13 +852,11 @@ func (this *HomeController) NewList() {
|
|
|
// 无可见活动
|
|
|
condition += ` OR (source = 'activity' AND source_id IN (0))) `
|
|
|
}
|
|
|
+ } else if mmIds != "" {
|
|
|
+ condition = ` AND ( source = 'meetingreviewchapt' AND source_id IN (` + mmIds + `) ) `
|
|
|
} else {
|
|
|
condition += ` AND ((source = 'article' AND source_id IN (0)) OR (source = 'activity' AND source_id IN (0))) `
|
|
|
}
|
|
|
-
|
|
|
- if mmIds != "" {
|
|
|
- condition += ` OR ( source = 'meetingreviewchapt' AND source_id IN (` + mmIds + `) ) `
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
if lenActivityIds > 0 && tagIds == "" {
|