diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index ae3597d8..e293dca8 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -565,7 +565,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService Map map = new HashMap<>(); map.put("id", Util.null2String(mergeParam.getId())); // 删除部门 - ServiceUtil.getService(OrganizationServiceImpl.class, user).delDepartment(map, user); + ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user); // 更新组织架构图 // TODO new DepartmentTriggerRunnable(mergeDepartment).run(); // 更新部门合并后名称 diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index edaef97b..717e9c8f 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -122,7 +122,9 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe ManagerDetachPO managerDetachPO = ManagerDetachPO.builder() .managerType(0) .ecManager(param.getEcManager()) + .jclManager(param.getEcManager()) .ecRolelevel(param.getEcRolelevel()) + .jclRolelevel(param.getEcRolelevel()) .manageModule("组织管理") .creator((long)user.getUID()) .deleteType(0) @@ -139,6 +141,8 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe .id(param.getId()) .ecManager(param.getEcManager()) .ecRolelevel(param.getEcRolelevel()) + .jclManager(param.getEcManager()) + .jclRolelevel(param.getEcRolelevel()) .build(); return getMangeDetachMapper().updateDetach(managerDetachPO); }