From 1a307f99232afb8bfa3114b6649c4b8cb9f6aeb9 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Mon, 31 Jul 2023 09:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=88=E5=B9=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8D=A0=E7=94=A8=E9=87=8A=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/DepartmentServiceImpl.java    | 6 +++++-
 1 file 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 38188968..2ff48ed1 100644
--- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
+++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
@@ -570,9 +570,13 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         }
         // 原部门删除
         // DepartmentPO mergeDepartment = getDepartmentMapper().getDeptById(mergeParam.getId());
+        // 删除部门（先更改原部门名称，释放原部门名称，然后删除）
+        DepartmentPO sourceDepartmentPO = getDepartmentMapper().getDeptById(mergeParam.getId());
+        sourceDepartmentPO.setDepartmentName(sourceDepartmentPO.getDepartmentName() + "_被合并");
+        sourceDepartmentPO.setDepartmentMark(sourceDepartmentPO.getDepartmentMark() + "_被合并");
+        updateEcDepartment(sourceDepartmentPO);
         Map<String, Object> map = new HashMap<>();
         map.put("id", Util.null2String(mergeParam.getId()));
-        // 删除部门
         ServiceUtil.getService(OrganizationServiceImpl.class, user).doDepartmentCancel(map, user);
         // 更新组织架构图
         //  new DepartmentTriggerRunnable(mergeDepartment).run();