|
@@ -61,7 +61,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void add(Employee employee){
|
|
|
SysUser user = sysUserFeignService.queryUserByMobile(employee.getPhone());
|
|
|
- if(user != null){
|
|
|
+ if(user != null && user.getId() != null){
|
|
|
employee.setUserType(SysUserType.SYSTEM);
|
|
|
teacherDao.updateUser(employee);
|
|
|
Employee employee1 = employeeDao.get(user.getId());
|
|
@@ -73,6 +73,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
|
}else{
|
|
|
new BizException("员工已存在");
|
|
|
}
|
|
|
+ return;
|
|
|
}
|
|
|
employee.setPassword(new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
|
|
|
employee.setUserType(SysUserType.SYSTEM);
|