部门合并，名称占用释放

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();