|
@@ -579,14 +579,21 @@ func (this *UserAuthController) PermissionList() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ privateAloneView := make([]*models.ChartPermissionTreeView, 0)
|
|
|
for _, vi := range privateView {
|
|
|
+ isHas := false
|
|
|
for _, vb := range publicView {
|
|
|
if vi.ChartPermissionId == vb.ChartPermissionId {
|
|
|
+ isHas = true
|
|
|
vb.Child = append(vb.Child, vi.Child...)
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
+ if !isHas {
|
|
|
+ privateAloneView = append(privateAloneView, vi)
|
|
|
+ }
|
|
|
}
|
|
|
+ publicView = append(publicView, privateAloneView...)
|
|
|
|
|
|
br.Data = publicView
|
|
|
br.Msg = "查询成功"
|