Commit 1c43017f authored by huyuchen's avatar huyuchen

优化修改

parent 72101c33
...@@ -646,6 +646,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -646,6 +646,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (!errorMessageList.isEmpty()) { if (!errorMessageList.isEmpty()) {
return R.failed(errorMessageList); return R.failed(errorMessageList);
} else { } else {
YifuUser user = SecurityUtils.getUser();
//更新项目档案 //更新项目档案
if (!updProjectList.isEmpty()) { if (!updProjectList.isEmpty()) {
baseMapper.updateReduceEmpProject(updProjectList); baseMapper.updateReduceEmpProject(updProjectList);
...@@ -653,12 +654,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -653,12 +654,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
//更新人员档案 //更新人员档案
if (!updList.isEmpty()) { if (!updList.isEmpty()) {
List<TEmployeeInfo> updEmpInfoList = updList.stream().distinct().collect(Collectors.toList()); List<TEmployeeInfo> updEmpInfoList = updList.stream().distinct().collect(Collectors.toList());
YifuUser user = SecurityUtils.getUser();
doJointTask.doUpdateEmployeeInfo(updEmpInfoList, user); doJointTask.doUpdateEmployeeInfo(updEmpInfoList, user);
} }
// 记录变更日志 // 记录变更日志
if (!updateProjectList.isEmpty()) { if (!updateProjectList.isEmpty()) {
doJointTask.saveModificationRecord(updateProjectList); doJointTask.saveModificationRecord(updateProjectList,user);
} }
} }
return R.ok(); return R.ok();
......
...@@ -132,12 +132,12 @@ public class DoJointTask { ...@@ -132,12 +132,12 @@ public class DoJointTask {
* @return: void * @return: void
**/ **/
@Async @Async
public void saveModificationRecord(List<EmployeeProjectNewOldVO> updateProjectList) { public void saveModificationRecord(List<EmployeeProjectNewOldVO> updateProjectList,YifuUser user) {
try { try {
for (EmployeeProjectNewOldVO newOldVO : updateProjectList) { for (EmployeeProjectNewOldVO newOldVO : updateProjectList) {
tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1] tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1],""
, "", newOldVO.getNewProjectEmployee().getId() , newOldVO.getNewProjectEmployee().getId(), newOldVO.getOldProjectEmployee(),
, newOldVO.getOldProjectEmployee(), newOldVO.getNewProjectEmployee()); newOldVO.getNewProjectEmployee(),user);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("档案-更新项目档案操作记录错误", e); log.error("档案-更新项目档案操作记录错误", e);
......
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