|
@@ -141,7 +141,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public void add(Employee employee) {
|
|
public void add(Employee employee) {
|
|
RBucket<String> bucket = redissonClient.getBucket("add_employee_lock" + employee.getPhone());
|
|
RBucket<String> bucket = redissonClient.getBucket("add_employee_lock" + employee.getPhone());
|
|
- if (!bucket.trySet(employee.getPhone(), 1l, TimeUnit.SECONDS)) {
|
|
|
|
|
|
+ if (!bucket.trySet(employee.getPhone(), 1L, TimeUnit.SECONDS)) {
|
|
throw new BizException("请勿重复提交");
|
|
throw new BizException("请勿重复提交");
|
|
}
|
|
}
|
|
SysUser user = teacherDao.getUserWithPhone(employee.getPhone());
|
|
SysUser user = teacherDao.getUserWithPhone(employee.getPhone());
|
|
@@ -149,6 +149,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
|
|
throw new BizException("用户已存在学校账户");
|
|
throw new BizException("用户已存在学校账户");
|
|
}
|
|
}
|
|
Integer tenantId = employee.getTenantId();
|
|
Integer tenantId = employee.getTenantId();
|
|
|
|
+
|
|
if (user != null && user.getId() != null) {
|
|
if (user != null && user.getId() != null) {
|
|
checkTenantId(tenantId, user.getTenantId());
|
|
checkTenantId(tenantId, user.getTenantId());
|
|
Employee employee1 = employeeDao.get(user.getId());
|
|
Employee employee1 = employeeDao.get(user.getId());
|
|
@@ -175,6 +176,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
|
|
}
|
|
}
|
|
employee.setUserType(user.getUserType() + ",SYSTEM");
|
|
employee.setUserType(user.getUserType() + ",SYSTEM");
|
|
teacherDao.updateUser(employee);
|
|
teacherDao.updateUser(employee);
|
|
|
|
+
|
|
|
|
+ // 用户更新信息同步到三方
|
|
|
|
+ if (Objects.nonNull(employee.getId())) {
|
|
|
|
+ registerImUserInfo(employee.getId());
|
|
|
|
+ }
|
|
return;
|
|
return;
|
|
} else {
|
|
} else {
|
|
throw new BizException("员工已存在");
|
|
throw new BizException("员工已存在");
|
|
@@ -214,10 +220,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
|
|
addUserTenant(employee.getTenantIds(), tenantId, userId);
|
|
addUserTenant(employee.getTenantIds(), tenantId, userId);
|
|
//添加到OA
|
|
//添加到OA
|
|
oaUserService.addOaUser(employee);
|
|
oaUserService.addOaUser(employee);
|
|
- // 用户更新信息同步到三方
|
|
|
|
- if (Objects.nonNull(employee.getId())) {
|
|
|
|
- registerImUserInfo(employee.getId());
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -313,7 +316,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
|
|
});
|
|
});
|
|
|
|
|
|
// 用户更新信息同步到三方
|
|
// 用户更新信息同步到三方
|
|
- registerImUserInfo(employee.getId());
|
|
|
|
|
|
+ if (Objects.nonNull(employee.getId())) {
|
|
|
|
+ registerImUserInfo(employee.getId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -740,6 +745,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 用户更新信息同步到三方
|
|
|
|
+ * @param userId 用户id
|
|
|
|
+ */
|
|
private void registerImUserInfo(Integer userId) {
|
|
private void registerImUserInfo(Integer userId) {
|
|
SysUser userInfo = teacherDao.getUser(userId);
|
|
SysUser userInfo = teacherDao.getUser(userId);
|
|
if (Objects.nonNull(userInfo)) {
|
|
if (Objects.nonNull(userInfo)) {
|