From ba0b31f086acbfaa460a98e1717be01470f9f044 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 6 Sep 2022 14:26:09 +0800
Subject: [PATCH 1/2] fixed

---
 src/com/engine/organization/mapper/scheme/SchemeMapper.xml    | 2 +-
 src/com/engine/organization/service/impl/CompServiceImpl.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
index 38a28827..b47f9615 100644
--- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
@@ -77,7 +77,7 @@
     <select id="getTreeData" resultMap="TreeResultMap">
         select id, scheme_name,forbidden_tag
         from jcl_org_scheme
-        where delete_type = '0'
+        where delete_type = '0' and forbidden_tag = 0
     </select>
     <select id="getSchemesByIds" resultMap="BaseResultMap">
         select
diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java
index 013dcb72..71491f21 100644
--- a/src/com/engine/organization/service/impl/CompServiceImpl.java
+++ b/src/com/engine/organization/service/impl/CompServiceImpl.java
@@ -347,6 +347,7 @@ public class CompServiceImpl extends Service implements CompService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
         SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "转移到", "161", "company", "compBrowser");
+        compBrowserItem.setHelpfulTip("在不选择分部情况下,默认转移到一级分部！！！");
         condition.add(compBrowserItem);
         addGroups.add(new SearchConditionGroup("", true, condition));
         return addGroups;
@@ -355,7 +356,7 @@ public class CompServiceImpl extends Service implements CompService {
     @Override
     public int moveCompany(DepartmentMoveParam moveParam) {
         Long targetCompanyId = moveParam.getCompany();
-        OrganizationAssert.notNull(targetCompanyId, "请选择要转移到的分部");
+        //OrganizationAssert.notNull(targetCompanyId, "请选择要转移到的分部");
         Long companyId = moveParam.getId();
         // 判断目标分部是否为它本身以及子元素
         Set<Long> disableIds = new HashSet<>();

From 8553e37c223028965ab4c7803c0f1ba1ccdf474b Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Tue, 6 Sep 2022 15:31:24 +0800
Subject: [PATCH 2/2] fixed

---
 src/com/engine/organization/wrapper/SchemeWrapper.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/engine/organization/wrapper/SchemeWrapper.java b/src/com/engine/organization/wrapper/SchemeWrapper.java
index 19af0bb6..dfe2d164 100644
--- a/src/com/engine/organization/wrapper/SchemeWrapper.java
+++ b/src/com/engine/organization/wrapper/SchemeWrapper.java
@@ -136,6 +136,7 @@ public class SchemeWrapper extends OrganizationWrapper {
         return getSchemeService(user).getTableBtn();
     }
 
+
     /**
      * 等级方案树
      * @return