mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-23 10:45:47 +08:00
fix: missing table prefix in get user group (#2590)
- Sort field and order field are missing table name prefix Co-authored-by: xgenvn <brian7.ng@gmail.com>
This commit is contained in:
parent
b9d171718f
commit
0199ad9aaa
@ -242,7 +242,8 @@ func GetPaginationGroupUsers(groupId string, offset, limit int, field, value, so
|
|||||||
}
|
}
|
||||||
|
|
||||||
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
tableNamePrefix := conf.GetConfigString("tableNamePrefix")
|
||||||
session := ormer.Engine.Table(tableNamePrefix+"user").
|
prefixedUserTable := tableNamePrefix + "user"
|
||||||
|
session := ormer.Engine.Table(prefixedUserTable).
|
||||||
Where("owner = ?", owner).In("name", names)
|
Where("owner = ?", owner).In("name", names)
|
||||||
|
|
||||||
if offset != -1 && limit != -1 {
|
if offset != -1 && limit != -1 {
|
||||||
@ -250,16 +251,19 @@ func GetPaginationGroupUsers(groupId string, offset, limit int, field, value, so
|
|||||||
}
|
}
|
||||||
|
|
||||||
if field != "" && value != "" {
|
if field != "" && value != "" {
|
||||||
session = session.And(fmt.Sprintf("user.%s like ?", util.CamelToSnakeCase(field)), "%"+value+"%")
|
session = session.And(fmt.Sprintf("%s.%s like ?", prefixedUserTable, util.CamelToSnakeCase(field)), "%"+value+"%")
|
||||||
}
|
}
|
||||||
|
|
||||||
if sortField == "" || sortOrder == "" {
|
if sortField == "" || sortOrder == "" {
|
||||||
sortField = "created_time"
|
sortField = "created_time"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
orderQuery := fmt.Sprintf("%s.%s", prefixedUserTable, util.SnakeString(sortField))
|
||||||
|
|
||||||
if sortOrder == "ascend" {
|
if sortOrder == "ascend" {
|
||||||
session = session.Asc(fmt.Sprintf("user.%s", util.SnakeString(sortField)))
|
session = session.Asc(orderQuery)
|
||||||
} else {
|
} else {
|
||||||
session = session.Desc(fmt.Sprintf("user.%s", util.SnakeString(sortField)))
|
session = session.Desc(orderQuery)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = session.Find(&users)
|
err = session.Find(&users)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user