|
@@ -579,8 +579,15 @@ func (this *UserAuthController) PermissionList() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ for _, vi := range privateView {
|
|
|
+ for _, vb := range publicView {
|
|
|
+ if vi.ChartPermissionId == vb.ChartPermissionId {
|
|
|
+ vb.Child = append(vb.Child, vi.Child...)
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- publicView = append(publicView, privateView...)
|
|
|
br.Data = publicView
|
|
|
br.Msg = "查询成功"
|
|
|
br.Success = true
|