public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] 查询组织认证权限错误

Browse Source
This commit is contained in:
PandaX
2023-12-06 12:19:40 +08:00
parent 48f1792f32
commit 955e92f781
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/system/services/role.go
View File

@@ -134,6 +134,10 @@ func (m *sysRoleModel) GetRoleOrganizationId(data entity.SysRole) []int64 {
func (m *sysRoleModel) FindOrganizationsByRoleId(roleId int64) (entity.SysRoleAuth, error) {
var roleData entity.SysRoleAuth
err := global.Db.Raw("SELECT sys_roles.data_scope, GROUP_CONCAT(sys_role_organizations.organization_id) as org FROM sys_roles LEFT JOIN sys_role_organizations ON sys_roles.role_id = sys_role_organizations.role_id WHERE sys_roles.role_id = ? GROUP BY sys_roles.role_id", roleId).Scan(&roleData).Error
GROUP_CONCAT := "GROUP_CONCAT(sys_role_organizations.organization_id) as org"
if global.Conf.Server.DbType == "postgresql" {
GROUP_CONCAT = "string_agg(CAST(sys_role_organizations.organization_id AS VARCHAR), ',') as org"
}
err := global.Db.Raw("SELECT sys_roles.data_scope, "+GROUP_CONCAT+" FROM sys_roles LEFT JOIN sys_role_organizations ON sys_roles.role_id = sys_role_organizations.role_id WHERE sys_roles.role_id = ? GROUP BY sys_roles.role_id", roleId).Scan(&roleData).Error
return roleData, err
}

2
config.yml
View File

@@ -15,7 +15,7 @@ server:
rate:
enable: true
rate-num: 100
db-type: mysql
db-type: postgresql
# 是否开启数据库表初始化
isInitTable: false
excel-dir: ./resource/excel/