Commit 15cf9df9 authored by hongguangwu's avatar hongguangwu

MVP1.7.7-项目

parent 2f48885b
...@@ -2094,6 +2094,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -2094,6 +2094,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
**/ **/
@Override @Override
public void doSaveBelongDept(TEmployeeProject p, String feedbackType) { public void doSaveBelongDept(TEmployeeProject p, String feedbackType) {
if (p != null) {
TEmployeeProjectBelongDeptSearchCspVo searchCspVo = new TEmployeeProjectBelongDeptSearchCspVo(); TEmployeeProjectBelongDeptSearchCspVo searchCspVo = new TEmployeeProjectBelongDeptSearchCspVo();
searchCspVo.setDeptId(p.getDeptId()); searchCspVo.setDeptId(p.getDeptId());
searchCspVo.setEmpIdCard(p.getEmpIdcard()); searchCspVo.setEmpIdCard(p.getEmpIdcard());
...@@ -2138,5 +2139,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -2138,5 +2139,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} }
} }
} }
}
} }
...@@ -1822,7 +1822,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1822,7 +1822,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmployeeProjectService.updateById(project); tEmployeeProjectService.updateById(project);
} else { } else {
this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept); project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
} }
} else { } else {
// 新建档案、项目档案,将档案id赋值,给其他附属信息 // 新建档案、项目档案,将档案id赋值,给其他附属信息
...@@ -1835,7 +1835,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1835,7 +1835,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
empId = emp.getId(); empId = emp.getId();
empIdCard = emp.getEmpIdcard(); empIdCard = emp.getEmpIdcard();
// 2项目档案 // 2项目档案
this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept); project = this.saveTEmployeeProject(project, user, tPreEmployeeProject, emp, dept);
} }
} }
if (emp == null) { if (emp == null) {
......
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