Commit 298fd652 authored by hongguangwu's avatar hongguangwu

MVP1.7.7-合同信息

parent e3a90f58
...@@ -681,6 +681,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper, ...@@ -681,6 +681,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
tEmployeeProjectService.updateChangeById(oldEmpProject); tEmployeeProjectService.updateChangeById(oldEmpProject);
//新增或变更新的项目档案 //新增或变更新的项目档案
tEmployeeProjectService.saveOrUpdate(newEmpProject); tEmployeeProjectService.saveOrUpdate(newEmpProject);
// 增加,同步CSP,下面的减少老项目档案,在方法里有减少CSP
tEmployeeProjectService.doSaveBelongDept(newEmpProject, CommonConstants.ONE_STRING);
//同步减项老项目档案 //同步减项老项目档案
if (CommonConstants.ONE_STRING.equals(vo.getChangeType())){ if (CommonConstants.ONE_STRING.equals(vo.getChangeType())){
oldEmpProject.setIsLeaveEmployee(CommonConstants.ZERO_INT); oldEmpProject.setIsLeaveEmployee(CommonConstants.ZERO_INT);
......
...@@ -2086,8 +2086,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -2086,8 +2086,8 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
searchCspVo.setFeedbackType(feedbackType); searchCspVo.setFeedbackType(feedbackType);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user != null && Common.isNotNull(user.getNickname())) { if (user != null && Common.isNotNull(user.getNickname())) {
searchCspVo.setUserId(p.getOperationUserId()); searchCspVo.setUserId(user.getId());
searchCspVo.setUserName(p.getOperationUserName()); searchCspVo.setUserName(user.getNickname());
} else if (Common.isNotNull(p.getOperationUserId())) { } else if (Common.isNotNull(p.getOperationUserId())) {
searchCspVo.setUserId(p.getOperationUserId()); searchCspVo.setUserId(p.getOperationUserId());
searchCspVo.setUserName(p.getOperationUserName()); searchCspVo.setUserName(p.getOperationUserName());
......
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