Merge branch 'ETA_2.0.6' into debug

controllers/oilchem_data.go

@@ -71,7 +71,7 @@ func (this *TradeCommonController) OilchemIndexList() {
 	var condition string
 	var pars []interface{}
 
-	if classifyId > 0{
+	if classifyId > 0 {
 		condition += ` AND classify_id=? `
 		pars = append(pars, classifyId)
 	}
@@ -103,7 +103,7 @@ func (this *TradeCommonController) OilchemIndexList() {
 	resp.List = indexList
 	resp.Paging = page
 
-	br.Data = indexList
+	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -915,7 +915,7 @@ func (this *TradeCommonController) ExportoilchemList() {
 			pars = append(pars, req.IndexCode)
 		}
 	}
-	if req.ClassifyId >= 0 {
+	if req.ClassifyId > 0 {
 		condition += ` AND classify_id=?`
 		pars = append(pars, req.ClassifyId)
 	}