From 123f7eaea6324ff75469e2ad43ca7324c06c3560 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Tue, 1 Aug 2023 16:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8B=96=E6=8B=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/DepartmentServiceImpl.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
index aa4b353e..fde416c0 100644
--- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
+++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java
@@ -727,6 +727,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
                 params.put("id",sourceId);
                 params.put("supsubcomid",targetId);
                 new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync();
+            } else if ("c".equals(targetType)) {
+                Map<String, Object> params = new HashMap<>();
+                params.put("id",sourceId);
+                params.put("supsubcomid","0");
+                new OrganizationSyncEc(user, LogModuleNameEnum.COMPANY, OperateTypeEnum.UPDATE, params).sync();
             } else {
                 //转移到部门下
                 List<DepartmentPO> deptListByPId = getDepartmentMapper().getDeptListByPId(Util.getIntValue(targetId));
@@ -735,7 +740,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
                 if (CollectionUtils.isNotEmpty(deptListByPId)) {
                     addDisableIds(disableIds, deptListByPId);
                 }
-                OrganizationAssert.isFalse(disableIds.contains(Util.getIntValue(targetId)), "请勿选择当前部门本身及其子部门");
+                OrganizationAssert.isFalse( "d".equals(targetType)&&disableIds.contains(Util.getIntValue(targetId)), "请勿选择当前部门本身及其子部门");
                 deptById.setSupDepId(Util.getIntValue(targetId));
                 DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(Util.getIntValue(targetId));
                 deptById.setSubCompanyId1(parentDepartment.getSubCompanyId1());