xingzai 1 éve
szülő
commit
4f1efc345c
1 módosított fájl, 2 hozzáadás és 2 törlés
  1. 2 2
      controllers/activity.go

+ 2 - 2
controllers/activity.go

@@ -3866,9 +3866,9 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	// 如果是C类电话会就不展示内容,且合并到分析师电话会
 	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 `
 	}