|
@@ -7,7 +7,7 @@ import (
|
|
|
"fmt"
|
|
|
)
|
|
|
|
|
|
-// 新增或者更新用户
|
|
|
+// 新增或者更新角色
|
|
|
func AddOrUpdateRole(req *system.AddRoleReq) (err error, isSendEmail bool) {
|
|
|
defer func() {
|
|
|
if err != nil {
|
|
@@ -17,8 +17,7 @@ func AddOrUpdateRole(req *system.AddRoleReq) (err error, isSendEmail bool) {
|
|
|
}()
|
|
|
isSendEmail = true
|
|
|
isAdd := true
|
|
|
- roleInfo := new(system.SysRole)
|
|
|
- roleInfo, err = system.GetSysRoleByRoleId(req.RoleId)
|
|
|
+ roleInfo, err := system.GetSysRoleByRoleId(req.RoleId)
|
|
|
if err != nil {
|
|
|
if err.Error() != utils.ErrNoRow() {
|
|
|
err = fmt.Errorf("获取数据失败,%v", err)
|
|
@@ -27,12 +26,15 @@ func AddOrUpdateRole(req *system.AddRoleReq) (err error, isSendEmail bool) {
|
|
|
}
|
|
|
if err == nil && roleInfo.RoleId > 0 {
|
|
|
isAdd = false
|
|
|
+ } else {
|
|
|
+ roleInfo = new(system.SysRole)
|
|
|
}
|
|
|
// 角色信息
|
|
|
roleInfo.RoleId = req.RoleId
|
|
|
roleInfo.RoleName = req.RoleName
|
|
|
roleInfo.RoleType = req.RoleType
|
|
|
roleInfo.RoleTypeCode = req.RoleTypeCode
|
|
|
+ roleInfo.RoleLevel = req.RoleLevel
|
|
|
roleInfo.ModifyTime = req.ModifyTime
|
|
|
roleInfo.CreateTime = req.CreateTime
|
|
|
if isAdd {
|