|
@@ -149,12 +149,16 @@ func RaiCompanyPermissionAndCheckList(companyId int, unify bool) (resp *company.
|
|
|
}
|
|
|
//有升级权限时只展示一个
|
|
|
newpPermissionItems := make([]*company.PermissionLookItem, 0)
|
|
|
- upgradeMap := make(map[string]int)
|
|
|
- for _, v := range permissionItems {
|
|
|
- if _, ok := upgradeMap[v.PermissionName]; !ok {
|
|
|
- newpPermissionItems = append(newpPermissionItems, v)
|
|
|
- if strings.Contains(v.PermissionName, "升级") {
|
|
|
- upgradeMap[v.PermissionName] = v.ChartPermissionId
|
|
|
+ if unify {
|
|
|
+ newpPermissionItems = permissionItems
|
|
|
+ } else {
|
|
|
+ upgradeMap := make(map[string]int)
|
|
|
+ for _, v := range permissionItems {
|
|
|
+ if _, ok := upgradeMap[v.PermissionName]; !ok {
|
|
|
+ newpPermissionItems = append(newpPermissionItems, v)
|
|
|
+ if strings.Contains(v.PermissionName, "升级") {
|
|
|
+ upgradeMap[v.PermissionName] = v.ChartPermissionId
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|