部分bug修复
This commit is contained in:
1 parent
9c7099db1f
commit
21a81a534c
10 files changed
+29
-18
No files matched your search
@@ -149,3 +149,7 @@ type MenuRole struct {
|
||||
system.SysMenus
|
||||
IsSelect bool `json:"is_select" gorm:"-"`
|
||||
}
|
||||
|
||||
type SelectRole struct {
|
||||
RoleId int `uri:"roleId"`
|
||||
}
|
||||
@@ -156,9 +156,9 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]system.SysMenu) e
|
||||
}
|
||||
|
||||
// SetSysMenuTree 设置菜单数据
|
||||
func (e *SysMenu) SetSysMenuLabel(c *dto.SysMenuSearch) (m []dto.MenuLabel, err error) {
|
||||
func (e *SysMenu) SetSysMenuLabel() (m []dto.MenuLabel, err error) {
|
||||
var list []system.SysMenu
|
||||
err = e.GetSysMenuList(c, &list)
|
||||
err = e.GetSysMenuList(&dto.SysMenuSearch{}, &list)
|
||||
|
||||
m = make([]dto.MenuLabel, 0)
|
||||
for i := 0; i < len(list); i++ {
|
||||
|
||||
@@ -38,10 +38,8 @@ func (e *SysRole) GetSysRolePage(c *dto.SysRoleSearch, list *[]system.SysRole, c
|
||||
// GetSysRole 获取SysRole对象
|
||||
func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error {
|
||||
var err error
|
||||
var data system.SysRole
|
||||
|
||||
db := e.Orm.Model(&data).
|
||||
First(model, d.GetId())
|
||||
db := e.Orm.First(model, d.GetId())
|
||||
err = db.Error
|
||||
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
err = errors.New("查看对象不存在或无权查看")
|
||||
@@ -52,7 +50,7 @@ func (e *SysRole) GetSysRole(d *dto.SysRoleById, model *system.SysRole) error {
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
return err
|
||||
}
|
||||
data.MenuIds, err = e.GetRoleMenuId(e.Orm, data.RoleId)
|
||||
model.MenuIds, err = e.GetRoleMenuId(e.Orm, model.RoleId)
|
||||
if err != nil {
|
||||
e.Log.Errorf("get menuIds error, %s", err.Error())
|
||||
return err
|
||||
|
||||
Reference in new issue
Block a user