llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix GetGroups() API bug when parentGroup is in next page (#3843)

Browse Source
This commit is contained in:
DacongDA
2025-05-28 18:31:52 +08:00
committed by GitHub
parent 731daf5204
commit 0ad4d82d9c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/group.go
View File

@ -15,6 +15,7 @@ package controllers
import ( import (
"encoding/json" "encoding/json"
"fmt"
"github.com/beego/beego/utils/pagination" "github.com/beego/beego/utils/pagination"
"github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/object"
@ -78,12 +79,12 @@ func (c *ApiController) GetGroups() {
} }
for _, group := range groups { for _, group := range groups {
_, ok := groupsHaveChildrenMap[group.Name] _, ok := groupsHaveChildrenMap[group.GetId()]
if ok { if ok {
group.HaveChildren = true group.HaveChildren = true
} }
parent, ok := groupsHaveChildrenMap[group.ParentId] parent, ok := groupsHaveChildrenMap[fmt.Sprintf("%s/%s", group.Owner, group.ParentId)]
if ok { if ok {
group.ParentName = parent.DisplayName group.ParentName = parent.DisplayName
} }

5
object/group.go
View File

@ -95,12 +95,13 @@ func GetGroupsHaveChildrenMap(groups []*Group) (map[string]*Group, error) {
} }
} }
err := ormer.Engine.Cols("owner", "name", "parent_id", "display_name").Distinct("parent_id").In("parent_id", groupIds).Find(&groupsHaveChildren) err := ormer.Engine.Cols("owner", "name", "parent_id", "display_name").Distinct("name").In("name", groupIds).Find(&groupsHaveChildren)
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, group := range groupsHaveChildren { for _, group := range groupsHaveChildren {
resultMap[group.ParentId] = groupMap[group.ParentId] resultMap[group.GetId()] = group
} }
return resultMap, nil return resultMap, nil
} }