|
@@ -132,16 +132,20 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
|
|
employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
|
|
employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
|
|
//添加用户现金账户
|
|
//添加用户现金账户
|
|
sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(), tenantId, "CNY"));
|
|
sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(), tenantId, "CNY"));
|
|
- ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(), null));
|
|
|
|
- employee.setImToken(imResult.getToken());
|
|
|
|
|
|
+// ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(), null));
|
|
|
|
+// employee.setImToken(imResult.getToken());
|
|
teacherDao.updateUser(employee);
|
|
teacherDao.updateUser(employee);
|
|
if (user != null) {
|
|
if (user != null) {
|
|
employee.setAvatar(user.getAvatar());
|
|
employee.setAvatar(user.getAvatar());
|
|
}
|
|
}
|
|
|
|
+ Integer userId = employee.getId();
|
|
|
|
+ if(Objects.nonNull(employee.getCreateTenantUserId())){
|
|
|
|
+ userId = employee.getCreateTenantUserId();
|
|
|
|
+ }
|
|
//添加平台用户和机构的关系
|
|
//添加平台用户和机构的关系
|
|
- addUserTenant(employee.getTenantIds(), tenantId, employee.getId());
|
|
|
|
|
|
+ addUserTenant(employee.getTenantIds(), tenantId, userId);
|
|
//添加到OA
|
|
//添加到OA
|
|
- oaUserService.addOaUser(employee);
|
|
|
|
|
|
+// oaUserService.addOaUser(employee);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|