|
@@ -1,6 +1,7 @@
|
|
package gn
|
|
package gn
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
+ "eta_gn/eta_bridge/global"
|
|
"eta_gn/eta_bridge/models/eta"
|
|
"eta_gn/eta_bridge/models/eta"
|
|
"eta_gn/eta_bridge/models/gn"
|
|
"eta_gn/eta_bridge/models/gn"
|
|
"eta_gn/eta_bridge/utils"
|
|
"eta_gn/eta_bridge/utils"
|
|
@@ -313,6 +314,18 @@ func AddAccount(userReq gn.UserEntity) (errMsg string, err error) {
|
|
newUser.CreatedTime = time.Now()
|
|
newUser.CreatedTime = time.Now()
|
|
newUser.LastUpdatedTime = time.Now()
|
|
newUser.LastUpdatedTime = time.Now()
|
|
newUser.OutID = *userReq.EmpNumber // 这里用工号
|
|
newUser.OutID = *userReq.EmpNumber // 这里用工号
|
|
|
|
+
|
|
|
|
+ // 默认角色
|
|
|
|
+ if global.CONFIG.Gn.DefaultRoleId > 0 {
|
|
|
|
+ roleInfo, tmpErr := eta.GetSysRoleById(global.CONFIG.Gn.DefaultRoleId)
|
|
|
|
+ if tmpErr == nil {
|
|
|
|
+ // 默认角色
|
|
|
|
+ newUser.RoleId = roleInfo.RoleId
|
|
|
|
+ newUser.RoleName = roleInfo.RoleName
|
|
|
|
+ newUser.RoleTypeCode = roleInfo.RoleTypeCode
|
|
|
|
+ //newUser.RoleType = roleInfo.RoleType
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if e = newUser.Create(); e != nil {
|
|
if e = newUser.Create(); e != nil {
|
|
errMsg = "操作失败"
|
|
errMsg = "操作失败"
|
|
err = fmt.Errorf("新增用户失败, %v", e)
|
|
err = fmt.Errorf("新增用户失败, %v", e)
|