diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index 39e32f06..a5ff62ff 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -549,7 +549,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService RecordSet rs = new RecordSet(); String targetEcDeptId = targetDepartment.getId().toString(); String mergeEcDeptId = mergeParam.getId().toString(); - rs.executeUpdate("update jcl_org_job set parent_comp =?,ec_company =?,parent_dept =?,ec_department =? where ec_department =?", targetDepartment.getSubCompanyId1(), targetDepartment.getSubCompanyId1(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId()); + //rs.executeUpdate("update jcl_org_job set parent_comp =?,ec_company =?,parent_dept =?,ec_department =? where ec_department =?", targetDepartment.getSubCompanyId1(), targetDepartment.getSubCompanyId1(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId()); // 更新岗位组织架构图 //for (JobPO jobPO : firstChildJobList) { // // 刷新组织架构图 @@ -644,7 +644,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService updateEcDepartment(deptById); // 刷新岗位分部 - refreshJobComp(deptById.getId(), deptById.getSubCompanyId1()); + //refreshJobComp(deptById.getId(), deptById.getSubCompanyId1()); List deptList = getDepartmentMapper().getDeptListByPId(deptById.getId()); // 更新当前部门下的人员 // new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", deptById.getSubCompanyId1(), deptById.getId()); @@ -674,7 +674,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService // 更新组织架构图 // TODO new DepartmentTriggerRunnable(departmentPO.getId()).run(); // 刷新岗位所属分部 - refreshJobComp(departmentPO.getId(), subCompanyId1); + //refreshJobComp(departmentPO.getId(), subCompanyId1); // 更新当前部门下的人员 // String ecDepartmentId = EcHrmRelationUtil.getEcDepartmentId(departmentPO.getId().toString()); //new RecordSet().executeUpdate("update hrmresource set SUBCOMPANYID1 =? where DEPARTMENTID = ?", ecCompanyId, ecDepartmentId);