refactor🎨:菜单、角色、用户模块调整

This commit is contained in:
wenjianzhang committed 2021-06-16 18:34:25 +08:00
1 parent e4ffd1df14
commit 8f637e02d0
3 files changed
+68 -46

No files matched your search

+25 -7
View File
@@ -252,24 +252,42 @@ func (e *SysRole) UpdateStatus(c *dto.UpdateStatusReq) error {
return nil
}
// Get 获取SysRole对象
func (e *SysRole) GetWithName(d *dto.SysRoleByName, model *models.SysRole) error {
// GetWithName 获取SysRole对象
func (e *SysRole) GetWithName(d *dto.SysRoleByName, model *models.SysRole) *SysRole {
var err error
db := e.Orm.Where("role_name = ?",d.RoleName).First(model)
db := e.Orm.Where("role_name = ?", d.RoleName).First(model)
err = db.Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看")
e.Log.Errorf("db error:%s", err)
return err
_ = e.AddError(err)
return e
}
if err != nil {
e.Log.Errorf("db error:%s", err)
return err
_ = e.AddError(err)
return e
}
model.MenuIds, err = e.GetRoleMenuId(model.RoleId)
if err != nil {
e.Log.Errorf("get menuIds error, %s", err.Error())
return err
_ = e.AddError(err)
return e
}
return nil
return e
}
// GetById 获取SysRole对象
func (e *SysRole) GetById(roleId int) ([]string, error) {
permissions := make([]string, 0)
model := models.SysRole{}
model.RoleId = roleId
if err := e.Orm.Model(&model).Preload("SysMenu").First(&model).Error; err != nil {
return nil, err
}
l := *model.SysMenu
for i := 0; i < len(l); i++ {
permissions = append(permissions, l[i].Permission)
}
return permissions, nil
}