Commit ea020fa0 authored by huyuchen's avatar huyuchen

huych-入离职登记提交

parent 36ccdaf2
......@@ -1019,11 +1019,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
YifuUser user = SecurityUtils.getUser();
SysCspDeptVo returnVo = userDeptPermissionService.selectCasDeptVo(vo.getUserId(),vo.getProjectId());
if (Common.isNotNull(returnVo) && Common.isNotNull(returnVo.getDepartName()) && Common.isNotNull(returnVo.getDepartId())) {
vo.setDepartName(user.getDeptName());
vo.setDepartId(user.getDeptId());
} else {
vo.setDepartName(returnVo.getDepartName());
vo.setDepartId(returnVo.getDepartId());
} else {
vo.setDepartName(user.getDeptName());
vo.setDepartId(user.getDeptId());
}
return R.ok(vo);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment