Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -608,7 +608,7 @@ func (this *BIDaShboardController) PublicList() {
 			Children:  make([]*bi_dashboard.RespPublicGroupListItem, 0),
 		}
 		if _, ok := publicDashboardClassifyIdMap[c.BiDashboardClassifyId]; ok {
-			for _, v := range publicAdminIdList {
+			for _, v := range adminIdList {
 				systemAdmin, ok := systemAdminMap[v]
 				if !ok {
 					continue
@@ -625,6 +625,7 @@ func (this *BIDaShboardController) PublicList() {
 					GroupId:   int64(systemAdmin.AdminId),
 					GroupName: systemAdmin.RealName,
 					AdminId:   systemAdmin.AdminId,
+					DashboardList: make([]*bi_dashboard.BiDashboard, 0),
 				}
 
 				for _, vv := range respGroupNameListItemList {
@@ -633,7 +634,6 @@ func (this *BIDaShboardController) PublicList() {
 						tmpItem.Children = append(tmpItem.Children, tmpRespGroupListItem)
 					}
 				}
-
 			}
 		}
 		resp = append(resp, tmpItem)