OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 用户数据接口权限

Browse Source
This commit is contained in:
TsMask
2023-11-02 17:13:05 +08:00
parent f8a996526f
commit d46e87f784
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/system/repository/sys_user.impl.go
View File

@@ -125,12 +125,11 @@ func (r *SysUserImpl) convertResultRows(rows []map[string]any) []model.SysUser {
// SelectUserPage 根据条件分页查询用户列表 // SelectUserPage 根据条件分页查询用户列表
func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) map[string]any { func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string) map[string]any {
selectUserSql := `select
u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id`
selectUserTotalSql := `select count(distinct u.user_id) as 'total' selectUserTotalSql := `select count(distinct u.user_id) as 'total'
from sys_user u left join sys_dept d on u.dept_id = d.dept_id` from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id`
// 查询条件拼接 // 查询条件拼接
var conditions []string var conditions []string
@@ -208,7 +207,7 @@ func (r *SysUserImpl) SelectUserPage(query map[string]any, dataScopeSQL string)
params = append(params, pageSize) params = append(params, pageSize)
// 查询数据 // 查询数据
querySql := selectUserSql + whereSql + dataScopeSQL + pageSql querySql := r.selectSql + whereSql + dataScopeSQL + pageSql
results, err := datasource.RawDB("", querySql, params) results, err := datasource.RawDB("", querySql, params)
if err != nil { if err != nil {
logger.Errorf("query err => %v", err) logger.Errorf("query err => %v", err)

4
src/modules/system/system.go
View File

@@ -98,7 +98,7 @@ func Setup(router *gin.Engine) {
controller.NewSysDept.TreeSelect, controller.NewSysDept.TreeSelect,
) )
sysDeptGroup.GET("/roleDeptTreeSelect/:roleId", sysDeptGroup.GET("/roleDeptTreeSelect/:roleId",
middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dept:query"}}), middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:dept:query", "system:user:edit"}}),
controller.NewSysDept.RoleDeptTreeSelect, controller.NewSysDept.RoleDeptTreeSelect,
) )
} }
@@ -213,7 +213,7 @@ func Setup(router *gin.Engine) {
controller.NewSysMenu.TreeSelect, controller.NewSysMenu.TreeSelect,
) )
sysMenuGroup.GET("/roleMenuTreeSelect/:roleId", sysMenuGroup.GET("/roleMenuTreeSelect/:roleId",
middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:menu:list"}}), middleware.PreAuthorize(map[string][]string{"hasPerms": {"system:menu:list", "system:role:query"}}),
controller.NewSysMenu.RoleMenuTreeSelect, controller.NewSysMenu.RoleMenuTreeSelect,
) )
} }