Browse Source

fix:修复已购权限

zqbao 9 months ago
parent
commit
5ff38cecee
2 changed files with 7 additions and 3 deletions
  1. 6 2
      controllers/user.go
  2. 1 1
      models/chart_permission.go

+ 6 - 2
controllers/user.go

@@ -554,6 +554,10 @@ func (this *UserAuthController) PurchasedPermission() {
 		br.ErrMsg = "查询用户权限失败,系统异常,Err:" + err.Error()
 		return
 	}
+	permissionMap := make(map[int]struct{})
+	for _, v := range permissionIds {
+		permissionMap[v] = struct{}{}
+	}
 	// 查询私有权限
 	privateResp, err := services.GetPrivateChartPermissionList()
 	if err != nil {
@@ -576,8 +580,8 @@ func (this *UserAuthController) PurchasedPermission() {
 			Sort:              v.Sort,
 			Child:             make([]*models.ChartPermissionTreeView, 0),
 		}
-		for _, vv := range permissionIds {
-			if v.ChartPermissionId == vv {
+		for _, vv := range v.Child {
+			if _, ok := permissionMap[vv.ChartPermissionId]; ok {
 				curPermissionView.Child = append(curPermissionView.Child, v)
 				IsAdd = true
 			}

+ 1 - 1
models/chart_permission.go

@@ -36,5 +36,5 @@ type ChartPermissionTreeView struct {
 	PermissionName    string                     `description:"权限名"`
 	Child             []*ChartPermissionTreeView `description:"子权限"`
 	IsPublic          int                        `description:"是否是公有权限1:公有权限,0私有权限"`
-	Sort              int                        `description:"排序"`
+	Sort              int                        `description:"排序" json:"-"`
 }