|
@@ -522,39 +522,40 @@ func (this *UserAuthController) PermissionList() {
|
|
|
}
|
|
|
publicView = publicResp.Data
|
|
|
|
|
|
- // 查询私有权限
|
|
|
- privateResp, err := services.GetPrivateChartPermissionList()
|
|
|
- if err != nil {
|
|
|
- br.Msg = "查询私有权限失败"
|
|
|
- br.ErrMsg = "查询私有权限失败,系统异常,Err:" + err.Error()
|
|
|
- }
|
|
|
- if privateResp.Ret != 200 {
|
|
|
- br.Msg = privateResp.Msg
|
|
|
- br.ErrMsg = privateResp.ErrMsg
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
+ // 如果是正式用户,则查询私有权限
|
|
|
var privateView []*models.ChartPermissionTreeView
|
|
|
- for _, v := range privateResp.Data {
|
|
|
- IsAdd := false
|
|
|
- curPermissionView := &models.ChartPermissionTreeView{
|
|
|
- ChartPermissionId: v.ChartPermissionId,
|
|
|
- PermissionName: v.PermissionName,
|
|
|
- IsPublic: v.IsPublic,
|
|
|
- Sort: v.Sort,
|
|
|
- Child: make([]*models.ChartPermissionTreeView, 0),
|
|
|
+ if user.Status == utils.UserStatusFormal {
|
|
|
+ privateResp, err := services.GetPrivateChartPermissionList()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "查询私有权限失败"
|
|
|
+ br.ErrMsg = "查询私有权限失败,系统异常,Err:" + err.Error()
|
|
|
}
|
|
|
- for _, vv := range permissionIds {
|
|
|
- if v.ChartPermissionId == vv {
|
|
|
- curPermissionView.Child = append(curPermissionView.Child, v)
|
|
|
- IsAdd = true
|
|
|
- }
|
|
|
+ if privateResp.Ret != 200 {
|
|
|
+ br.Msg = privateResp.Msg
|
|
|
+ br.ErrMsg = privateResp.ErrMsg
|
|
|
+ return
|
|
|
}
|
|
|
- if IsAdd {
|
|
|
- privateView = append(privateView, curPermissionView)
|
|
|
+
|
|
|
+ for _, v := range privateResp.Data {
|
|
|
+ IsAdd := false
|
|
|
+ curPermissionView := &models.ChartPermissionTreeView{
|
|
|
+ ChartPermissionId: v.ChartPermissionId,
|
|
|
+ PermissionName: v.PermissionName,
|
|
|
+ IsPublic: v.IsPublic,
|
|
|
+ Sort: v.Sort,
|
|
|
+ Child: make([]*models.ChartPermissionTreeView, 0),
|
|
|
+ }
|
|
|
+ for _, vv := range permissionIds {
|
|
|
+ if v.ChartPermissionId == vv {
|
|
|
+ curPermissionView.Child = append(curPermissionView.Child, v)
|
|
|
+ IsAdd = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if IsAdd {
|
|
|
+ privateView = append(privateView, curPermissionView)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
if len(privateView) == 0 {
|
|
|
br.Data = publicView
|
|
|
} else {
|