Merge branch 'needs/834' into debug

controllers/classify.go

@@ -870,7 +870,9 @@ func (this *ClassifyController) TelListClassify() {
 	resp := make([]*models.SimpleClassifyList, 0)
 	var condition, orderRule string
 	var pars []interface{}
-	condition += ` AND has_teleconference = 1`
+	if utils.SystemType == "hz" {
+		condition += ` AND classify_name <> '晨报' AND classify_name <> '周报' `
+	}
 	telList, e := models.GetClassifyByCondition(condition, orderRule, pars)
 	if e != nil {
 		return