From 550be7fb14fd0d489b2953a23c012eacf9e00889 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 15 Dec 2022 09:49:55 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/DepartmentServiceImpl.java | 2 +- .../organization/service/impl/ManagerDetachServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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); }