|
@@ -371,6 +371,7 @@ func (this *UsersController) CheckAdd() {
|
|
|
resp := new(response.UsersAddCheckResp)
|
|
|
resp.Tips = "校验通过"
|
|
|
if exist != nil {
|
|
|
+ resp.UserId = exist.UserId
|
|
|
// 试用客户
|
|
|
if exist.Status == models.UserStatusTrial {
|
|
|
resp.CheckResult = 1
|
|
@@ -711,7 +712,7 @@ func (this *UsersController) TransFormal() {
|
|
|
go func() {
|
|
|
recordOb := new(models.CompanyUserOperateRecord)
|
|
|
recordOb.UserId = userItem.UserId
|
|
|
- recordOb.Remark = fmt.Sprintf("%s转正式", sysUser.SysRealName)
|
|
|
+ recordOb.Remark = fmt.Sprintf("%s试用转正式", sysUser.SysRealName)
|
|
|
recordOb.SysUserId = sysUser.SysUserId
|
|
|
recordOb.SysUserRealName = sysUser.SysRealName
|
|
|
recordOb.CreateTime = time.Now().Local()
|