|
|
@@ -441,6 +441,7 @@ func GetCygxCygxArticleListByConditionSoloTag(articleTypeCondSlice, activityType
|
|
|
}
|
|
|
artSql += ` WHERE 1=1 AND ((1=1 `
|
|
|
actSql += ` WHERE 1=1 AND ((1=1 `
|
|
|
+ mmSql += ` WHERE 1=1 AND ((1=1 `
|
|
|
var isNeedArt, isNeedAct, isNeedMm bool
|
|
|
for i, _ := range articleTypeCondSlice {
|
|
|
articleTypesCond := articleTypeCondSlice[i]
|
|
|
@@ -467,7 +468,7 @@ func GetCygxCygxArticleListByConditionSoloTag(articleTypeCondSlice, activityType
|
|
|
artSql += `) OR (1=1 `
|
|
|
}
|
|
|
|
|
|
- isNeedAct = true
|
|
|
+ isNeedArt = true
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -493,7 +494,6 @@ func GetCygxCygxArticleListByConditionSoloTag(articleTypeCondSlice, activityType
|
|
|
}
|
|
|
|
|
|
if strings.Contains(articleTypeStr, "晨会精华") {
|
|
|
- mmSql += ` WHERE 1=1 `
|
|
|
if industryStr != "" && subjectNameStr != "" {
|
|
|
mmSql += ` AND (im.industry_name In (` + industryStr + `) OR cis.subject_name In (` + subjectNameStr + `) )`
|
|
|
} else if industryStr == "" && subjectNameStr != "" {
|
ziwen