zwxi преди 7 месеца
родител
ревизия
fe7f4b3550
променени са 2 файла, в които са добавени 18 реда и са изтрити 2 реда
  1. 10 2
      controllers/hisugar_data.go
  2. 8 0
      models/data_manage/base_from_hisugar.go

+ 10 - 2
controllers/hisugar_data.go

@@ -897,8 +897,16 @@ func (this *TradeCommonController) HisugarIndexData() {
 	var condition string
 	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 +`)`
+			pars = append(pars, classifyIds)
+		}
 	}
 
 	if frequency != "" {

+ 8 - 0
models/data_manage/base_from_hisugar.go

@@ -382,4 +382,12 @@ func GetHisugarIndexInfoPage(condition string, pars []interface{}, size int, pag
 	_, err = o.Raw(sql, pars, size, pageSize).QueryRows(&items)
 	return
 
+}
+
+// 获取所有分类
+func GetHisugarClassifyById(classifyId int) (ClassifyIds string, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT GROUP_CONCAT(classify_id) AS classify_ids FROM base_from_hisugar_classify WHERE classify_id=? OR parent_id=?`
+	err = o.Raw(sql,classifyId,classifyId).QueryRow(&ClassifyIds)
+	return
 }