|
@@ -3866,9 +3866,9 @@ func (this *ActivityCoAntroller) OverActivityList() {
|
|
|
|
|
|
if typeName == "1" || typeName == "2" {
|
|
|
if typeName == strconv.Itoa(utils.ANALYST_TELL_ACTIVITY_TYPE_ID) {
|
|
|
- condition = ` AND art.publish_status = 1 AND art.label != '' AND art.activity_type_id IN (` + typeName + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
|
|
|
+ condition += ` AND art.publish_status = 1 AND art.label != '' AND art.activity_type_id IN (` + typeName + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
|
|
|
} else {
|
|
|
- condition = ` AND art.publish_status = 1 AND art.label != '' AND art.activity_type_id IN (` + typeName + `)`
|
|
|
+ condition += ` AND art.publish_status = 1 AND art.label != '' AND art.activity_type_id IN (` + typeName + `)`
|
|
|
}
|
|
|
conditionSpecialinit += ` AND art.activity_id = 0 `
|
|
|
}
|