Commit 1c43017f authored by huyuchen's avatar huyuchen

优化修改

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