Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

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

src/com/engine/organization/wrapper/SchemeWrapper.java

@@ -136,6 +136,7 @@ public class SchemeWrapper extends OrganizationWrapper {
         return getSchemeService(user).getTableBtn();
     }
 
+
     /**
      * 等级方案树
      * @return