fix🐛 :修复角色数据权限更新失(#380)
This commit is contained in:
1 parent
91c9a2c7f9
commit
86c7c64a32
5 files changed
+101
-93
No files matched your search
@@ -1,6 +1,7 @@
|
|||||||
package sys_dept
|
package sys_dept
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -254,30 +255,33 @@ func (e *SysDept) GetDeptTree(c *gin.Context) {
|
|||||||
e.OK(c, list, "")
|
e.OK(c, list, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
//func (e *SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
|
func (e *SysDept) GetDeptTreeRoleSelect(c *gin.Context) {
|
||||||
// log := e.GetLogger(c)
|
log := e.GetLogger(c)
|
||||||
// db, err := tools.GetOrm(c)
|
db, err := e.GetOrm(c)
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// log.Error(err)
|
log.Error(err)
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// s := service.SysDept{}
|
s := service.SysDept{}
|
||||||
// s.Orm = db
|
s.Orm = db
|
||||||
// s.MsgID = msgID
|
s.Log = log
|
||||||
// id, err := tools.StringToInt(c.Param("roleId"))
|
id, err := pkg.StringToInt(c.Param("roleId"))
|
||||||
// result, err := s.SetDeptLabel()
|
result, err := s.SetDeptLabel()
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// log.Errorf("SetDeptLabel error, %s", msgID, err.Error())
|
log.Errorf("SetDeptLabel error, %s", err.Error())
|
||||||
// e.Error(c, http.StatusInternalServerError, err, "")
|
e.Error(c, http.StatusInternalServerError, err, "")
|
||||||
// }
|
}
|
||||||
// menuIds := make([]int, 0)
|
menuIds := make([]int, 0)
|
||||||
// if id != 0 {
|
if id != 0 {
|
||||||
// menuIds, err = s.GetRoleDeptId(id)
|
menuIds, err = s.GetRoleDeptId(id)
|
||||||
// tools.HasError(err, "抱歉未找到相关信息", -1)
|
if err != nil {
|
||||||
// }
|
log.Errorf("抱歉未找到相关信息, %s", err.Error())
|
||||||
// e.OK(c, gin.H{
|
e.Error(c, http.StatusInternalServerError, err, "")
|
||||||
// "depts": result,
|
}
|
||||||
// "checkedKeys": menuIds,
|
}
|
||||||
// }, "")
|
e.OK(c, gin.H{
|
||||||
//}
|
"depts": result,
|
||||||
|
"checkedKeys": menuIds,
|
||||||
|
}, "")
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package router
|
package router
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"go-admin/app/admin/apis/system/sys_dept"
|
||||||
"go-admin/app/admin/apis/system/sys_menu"
|
"go-admin/app/admin/apis/system/sys_menu"
|
||||||
//"go-admin/app/admin/models/tools"
|
//"go-admin/app/admin/models/tools"
|
||||||
middleware2 "go-admin/common/middleware"
|
middleware2 "go-admin/common/middleware"
|
||||||
@@ -119,12 +120,14 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
|
|||||||
|
|
||||||
func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
||||||
api := sys_menu.SysMenu{}
|
api := sys_menu.SysMenu{}
|
||||||
|
api2 := sys_dept.SysDept{}
|
||||||
v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
|
v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
|
||||||
{
|
{
|
||||||
//v1auth.GET("/getinfo", system.GetInfo)
|
//v1auth.GET("/getinfo", system.GetInfo)
|
||||||
v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect)
|
v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect)
|
||||||
v1.GET("/menuTreeselect", api.GetMenuTreeSelect)
|
v1.GET("/menuTreeselect", api.GetMenuTreeSelect)
|
||||||
//v1auth.GET("/roleDeptTreeselect/:roleId", system.GetDeptTreeRoleselect)
|
v1auth.GET("/roleDeptTreeselect/:roleId", api2.GetDeptTreeRoleSelect )
|
||||||
|
//GetDeptTreeRoleselect)
|
||||||
v1auth.POST("/logout", handler.LogOut)
|
v1auth.POST("/logout", handler.LogOut)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ type SysRoleControl struct {
|
|||||||
Flag string `form:"flag" comment:"标记"` // 标记
|
Flag string `form:"flag" comment:"标记"` // 标记
|
||||||
Remark string `form:"remark" comment:"备注"` // 备注
|
Remark string `form:"remark" comment:"备注"` // 备注
|
||||||
Admin bool `form:"admin" comment:"是否管理员"`
|
Admin bool `form:"admin" comment:"是否管理员"`
|
||||||
DataScope string `form:"dataScope" comment:"是否管理员"`
|
DataScope string `form:"dataScope"`
|
||||||
MenuIds []int `json:"menuIds"`
|
MenuIds []int `json:"menuIds"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package service
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
log "github.com/go-admin-team/go-admin-core/logger"
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
|
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
@@ -220,66 +221,66 @@ func (e *SysDept) deptPageCall(deptlist *[]system.SysDept, menu system.SysDept)
|
|||||||
return menu
|
return menu
|
||||||
}
|
}
|
||||||
|
|
||||||
//// GetRoleDeptId 获取角色的部门ID集合
|
// GetRoleDeptId 获取角色的部门ID集合
|
||||||
//func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) {
|
func (e *SysDept) GetRoleDeptId(roleId int) ([]int, error) {
|
||||||
// deptIds := make([]int, 0)
|
deptIds := make([]int, 0)
|
||||||
// deptList := make([]dto.DeptIdList, 0)
|
deptList := make([]dto.DeptIdList, 0)
|
||||||
// if err := e.Orm.Table("sys_role_dept").
|
if err := e.Orm.Table("sys_role_dept").
|
||||||
// Select("sys_role_dept.dept_id").
|
Select("sys_role_dept.dept_id").
|
||||||
// Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").
|
Joins("LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id").
|
||||||
// Where("role_id = ? ", roleId).
|
Where("role_id = ? ", roleId).
|
||||||
// Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", roleId).
|
Where(" sys_role_dept.dept_id not in(select sys_dept.parent_id from sys_role_dept LEFT JOIN sys_dept on sys_dept.dept_id=sys_role_dept.dept_id where role_id =? )", roleId).
|
||||||
// Find(&deptList).Error; err != nil {
|
Find(&deptList).Error; err != nil {
|
||||||
// return nil, err
|
return nil, err
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// for i := 0; i < len(deptList); i++ {
|
for i := 0; i < len(deptList); i++ {
|
||||||
// deptIds = append(deptIds, deptList[i].DeptId)
|
deptIds = append(deptIds, deptList[i].DeptId)
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// return deptIds, nil
|
return deptIds, nil
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) {
|
func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) {
|
||||||
// list := make([]models.SysDept, 0)
|
list := make([]system.SysDept, 0)
|
||||||
// err = e.Orm.Find(&list).Error
|
err = e.Orm.Find(&list).Error
|
||||||
// if err != nil {
|
if err != nil {
|
||||||
// log.Error("find dept list error, %s", e.err)
|
log.Error("find dept list error, %s", err.Error())
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// m = make([]dto.DeptLabel, 0)
|
m = make([]dto.DeptLabel, 0)
|
||||||
// var item dto.DeptLabel
|
var item dto.DeptLabel
|
||||||
// for i := range list {
|
for i := range list {
|
||||||
// if list[i].ParentId != 0 {
|
if list[i].ParentId != 0 {
|
||||||
// continue
|
continue
|
||||||
// }
|
}
|
||||||
// item = dto.DeptLabel{}
|
item = dto.DeptLabel{}
|
||||||
// item.Id = list[i].DeptId
|
item.Id = list[i].DeptId
|
||||||
// item.Label = list[i].DeptName
|
item.Label = list[i].DeptName
|
||||||
// deptInfo := digitDeptLabel(&list, item)
|
deptInfo := digitDeptLabel(&list, item)
|
||||||
//
|
|
||||||
// m = append(m, deptInfo)
|
m = append(m, deptInfo)
|
||||||
// }
|
}
|
||||||
// return
|
return
|
||||||
//}
|
}
|
||||||
//
|
|
||||||
//// digitDeptLabel
|
// digitDeptLabel
|
||||||
//func digitDeptLabel(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabel {
|
func digitDeptLabel(deptList *[]system.SysDept, dept dto.DeptLabel) dto.DeptLabel {
|
||||||
// list := *deptList
|
list := *deptList
|
||||||
//
|
|
||||||
// var mi dto.DeptLabel
|
var mi dto.DeptLabel
|
||||||
// min := make([]dto.DeptLabel, 0)
|
min := make([]dto.DeptLabel, 0)
|
||||||
// for j := 0; j < len(list); j++ {
|
for j := 0; j < len(list); j++ {
|
||||||
//
|
|
||||||
// if dept.Id != list[j].ParentId {
|
if dept.Id != list[j].ParentId {
|
||||||
// continue
|
continue
|
||||||
// }
|
}
|
||||||
// mi = dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}}
|
mi = dto.DeptLabel{Id: list[j].DeptId, Label: list[j].DeptName, Children: []dto.DeptLabel{}}
|
||||||
// ms := digitDeptLabel(deptList, mi)
|
ms := digitDeptLabel(deptList, mi)
|
||||||
// min = append(min, ms)
|
min = append(min, ms)
|
||||||
//
|
|
||||||
// }
|
}
|
||||||
// dept.Children = min
|
dept.Children = min
|
||||||
// return dept
|
return dept
|
||||||
//}
|
}
|
||||||
@@ -197,7 +197,7 @@ func (e *SysRole) UpdateDataScope(c *system.SysRole) (err error) {
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
err = tx.Model(&system.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope, update_by").Updates(c).Error
|
err = tx.Model(&system.SysRole{}).Where("role_id = ?", c.RoleId).Select("data_scope", "update_by").Updates(c).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user