Merge branch 'bzq/dev' of eta_mini/eta_mini_bridge into debug

controllers/report.go

@@ -130,6 +130,9 @@ func (this *ReportController) List() {
 			return
 		}
 		for _, v := range classifyList {
+			if v.HasChild == 1 {
+				continue
+			}
 			switch v.Level {
 			case 1:
 				classifyFirstIds = append(classifyFirstIds, v.Id)
@@ -195,6 +198,9 @@ func (this *ReportController) List() {
 			return
 		}
 		for _, v := range classifyList {
+			if v.HasChild == 1 {
+				continue
+			}
 			switch v.Level {
 			case 1:
 				classifyFirstIds = append(classifyFirstIds, v.Id)

models/classify.go

@@ -12,6 +12,7 @@ type Classify struct {
 	ClassifyName string    `description:"分类名称"`
 	Sort         int       `json:"-"`
 	ParentId     int       `description:"父级分类id"`
+	HasChild     int       `description:"是否有子分类"`
 	CreateTime   time.Time `description:"创建时间"`
 	ModifyTime   time.Time `description:"修改时间"`
 	Level        int       `description:"分类层级"`
@@ -25,7 +26,7 @@ type ClassifyView struct {
 	CreateTime   time.Time       `description:"创建时间"`
 	ModifyTime   time.Time       `description:"修改时间"`
 	Level        int             `description:"分类层级"`
-	HasChild     int             `description:"是否有子分类0：下面没有子分类，1：下面有子分类"`
+	HasChild     int             `description:"是否有子分类0：下面没有子分类，1：下面有子分类" json:"-"`
 	Child        []*ClassifyView `description:"子分类"`
 }