Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -634,9 +634,9 @@ func (this *BIDaShboardController) PublicList() {
 					}
 				}
 
-				resp = append(resp, tmpItem)
 			}
 		}
+		resp = append(resp, tmpItem)
 	}
 
 	br.Ret = 200

models/bi_dashboard/bi_dashboard_classify.go

@@ -117,4 +117,4 @@ type RespPublicGroupListItem struct {
 	AdminId       int    `description:"目录创建者账号ID"`
 	DashboardList []*BiDashboard
 	Children      []*RespPublicGroupListItem
-}
+}