Merge branch 'ETA_2.0.5' into debug

controllers/hisugar_data.go

@@ -1073,8 +1073,15 @@ func (this *TradeCommonController) FrequencyList() {
 	var pars []interface{}
 
 	if classifyId > 0 {
-		condition += ` AND classify_id=? `
-		pars = append(pars, classifyId)
+		classifyIds, err := data_manage.GetHisugarClassifyById(classifyId)
+		if err != nil {
+			br.Msg = "获取数据失败"
+			br.ErrMsg = "获取数据失败,Err:" + err.Error()
+			return
+		}
+		if classifyIds != ""{
+			condition += ` AND classify_id IN (`+ classifyIds +`)`
+		}
 	}