Commit 3a9ae607 authored by huyuchen's avatar huyuchen

huych-入职登记提交

parent 3c7592cb
...@@ -678,6 +678,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -678,6 +678,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isNotNull(registrationNow.getEmpDeptid())) { if (Common.isNotNull(registrationNow.getEmpDeptid())) {
vo.setDepartName(registrationNow.getEmpDeptname()); vo.setDepartName(registrationNow.getEmpDeptname());
vo.setDepartId(Long.valueOf(registrationNow.getEmpDeptid())); vo.setDepartId(Long.valueOf(registrationNow.getEmpDeptid()));
vo.setProjectId(registrationNow.getEmpProjectId());
archivesDaprUtil.saveOrDeleteDeptRelation(vo); archivesDaprUtil.saveOrDeleteDeptRelation(vo);
} }
} else { } else {
...@@ -704,11 +705,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -704,11 +705,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
? RegistConstants.BEFORE_IN_PROJECT : RegistConstants.BEFORE_OUT_PROJECT); ? RegistConstants.BEFORE_IN_PROJECT : RegistConstants.BEFORE_OUT_PROJECT);
SysCspDeptVo deptVo = new SysCspDeptVo(); SysCspDeptVo deptVo = new SysCspDeptVo();
if (CommonConstants.ONE_STRING.equals(registrationNow.getFeedbackType())) { if (CommonConstants.ONE_STRING.equals(registrationNow.getFeedbackType())) {
deptVo.setDepartName(registrationNow.getEmpDeptname()); if (Common.isNotNull(registrationNow.getEmpDeptid())) {
deptVo.setDepartId(Long.valueOf(registrationNow.getEmpDeptid())); deptVo.setDepartName(registrationNow.getEmpDeptname());
deptVo.setDepartId(Long.valueOf(registrationNow.getEmpDeptid()));
deptVo.setProjectId(vo.getEmpProjectId());
archivesDaprUtil.saveOrDeleteDeptRelation(deptVo);
}
} else {
deptVo.setProjectId(vo.getEmpProjectId());
archivesDaprUtil.saveOrDeleteDeptRelation(deptVo);
} }
deptVo.setProjectId(vo.getEmpProjectId());
archivesDaprUtil.saveOrDeleteDeptRelation(deptVo);
baseMapper.updateById(registrationNow); baseMapper.updateById(registrationNow);
} }
return R.ok(); return R.ok();
......
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