|
@@ -150,7 +150,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> imp
|
|
|
break;
|
|
break;
|
|
|
case LOCK_UNLOCK:
|
|
case LOCK_UNLOCK:
|
|
|
SysUser sysUser = sysUserFeignService.queryUserById(employee.getUserId());
|
|
SysUser sysUser = sysUserFeignService.queryUserById(employee.getUserId());
|
|
|
- if(employee.getDemissionDate() != null && sysUser.getLockFlag() == 1){
|
|
|
|
|
|
|
+ if(employee != null && employee.getDemissionDate() != null && sysUser.getLockFlag() == 1){
|
|
|
throw new BizException("操作失败：离职员工不允许解冻");
|
|
throw new BizException("操作失败：离职员工不允许解冻");
|
|
|
}
|
|
}
|
|
|
employeeDao.updateUserLockStatus(employeeId);
|
|
employeeDao.updateUserLockStatus(employeeId);
|
yonge