diff --git a/erp_web/js/easyui-1.3.5/themes/icon.css b/erp_web/js/easyui-1.3.5/themes/icon.css
index fbe4ffe8..59e59fee 100644
--- a/erp_web/js/easyui-1.3.5/themes/icon.css
+++ b/erp_web/js/easyui-1.3.5/themes/icon.css
@@ -99,4 +99,7 @@
 }
 .icon-basket_add{
 	background:url('icons/basket_add.png') no-repeat center center;
+}
+.icon-user{
+	background:url('icons/user.png') no-repeat center center;
 }
\ No newline at end of file
diff --git a/erp_web/js/easyui-1.3.5/themes/icons/user.png b/erp_web/js/easyui-1.3.5/themes/icons/user.png
new file mode 100644
index 00000000..79f35ccb
Binary files /dev/null and b/erp_web/js/easyui-1.3.5/themes/icons/user.png differ
diff --git a/erp_web/login.html b/erp_web/login.html
index 2000892e..7a7fe7e5 100644
--- a/erp_web/login.html
+++ b/erp_web/login.html
@@ -4,6 +4,7 @@
     <title>ERP系统</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=8" >
+    <meta name="referrer" content="Webkit">
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <link type="text/css" rel="stylesheet" href="/css/css.css"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html
index 2dc19289..baebe71b 100644
--- a/erp_web/pages/manage/depot.html
+++ b/erp_web/pages/manage/depot.html
@@ -80,8 +80,11 @@
                 <td>负责人</td>
                 <td style="padding:5px">
                     <input name="principalName" id="principalName"
-                            style="width: 230px;height: 20px" readonly="readonly"/>
+                            style="width: 175px;height: 20px" readonly="readonly"/>
+                    <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectUser">
+                        <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
                     <input name="principal" id="principal" type="hidden"/>
+                    <input name="selectType" id="selectType" type="hidden"/>
                 </td>
             </tr>
             <tr>
@@ -104,6 +107,9 @@
     <a href="javascript:void(0)" id="cancelDepot" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
 </div>
+<div id="forSelectUserDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+     closed="true" modal="true" cache="false" collapsible="false" closable="true">
+</div>
 
 <script type="text/javascript">
     //初始化界面
@@ -164,7 +170,7 @@
                     formatter: function (value, rec) {
                         var str = '';
                         var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.sort + 'AaBb' + rec.remark + 'AaBb'
-                            + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+ transferUndefined(rec.principalName)+transferUndefined(rec.principal);
+                            + rec.address + 'AaBb' + rec.warehousing + 'AaBb' + rec.truckage+'AaBb'+ transferUndefined(rec.principalName)+'AaBb'+transferUndefined(rec.principal);
                         str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepot(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
                         str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepot(' + rec.id + ');"/>';
                         return str;
@@ -324,7 +330,7 @@
         $(".window-mask").css({width: webW, height: webH});
         $('#depotFM').form('clear');
         $("#name").focus();
-
+        $("#selectType").val("principal");
         oldDepot = "";
         depotID = 0;
         url = '/depot/add';
@@ -370,7 +376,9 @@
         $("#address").val(depotInfo[4]);
         $("#warehousing").val(depotInfo[5]);
         $("#truckage").val(depotInfo[6]);
-
+        $("#principalName").val(depotInfo[7]);
+        $("#principal").val(depotInfo[8]);
+        $("#selectType").val("principal");
         oldDepot = depotInfo[1];
         $('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑仓库信息');
         $(".window-mask").css({width: webW, height: webH});
@@ -486,6 +494,19 @@
         parent.addTab(currentRow[0].id + "单元", "/pages/materials/building.jsp?ProjectId=" + currentRow[0].id, "");
 
     });
+    //查询负责人信息
+    $("#lookForSelectUser").on("click", function () {
+        $('#forSelectUserDlg').dialog({
+            title: '负责人选择',
+            width: webW/2,
+            height: webH/2,
+            closed: false,
+            cache: false,
+            href: '/pages/manage/user_forselect.html',
+            modal: true,
+            resizable:true
+        });
+    });
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/erp_web/pages/manage/organization.html b/erp_web/pages/manage/organization.html
index 60f8ec8b..ff4e9332 100644
--- a/erp_web/pages/manage/organization.html
+++ b/erp_web/pages/manage/organization.html
@@ -116,6 +116,7 @@
     var url;
     //初始化界面
     $(function () {
+        var id=$("#id").val();
         var treeHeight=webH-35;
         //初始化系统基础信息
         $('#tableData').datagrid({
@@ -142,7 +143,7 @@
         });
         $('#tableData').prev('.datagrid-view2').find(".datagrid-body").append("<ul id='tt'><ul>");
         $('#tt').tree({
-            url: '/organization/getOrganizationTree',
+            url: '/organization/getOrganizationTree?id='+id,
             animate: true,
             checkbox: true,
             onDblClick: function(node){
diff --git a/erp_web/pages/manage/organization_forselect.html b/erp_web/pages/manage/organization_forselect.html
index 6050b4d6..0e6184cf 100644
--- a/erp_web/pages/manage/organization_forselect.html
+++ b/erp_web/pages/manage/organization_forselect.html
@@ -23,8 +23,9 @@
 <script type="text/javascript">
 
     $(function () {
+        var id=$("#id").val();
         $('#ttForSelect').tree({
-            url: '/organization/getOrganizationTree',
+            url: '/organization/getOrganizationTree?id='+id,
             animate: true,
             onDblClick: function (node) {
                 //双击修改
diff --git a/erp_web/pages/manage/user.html b/erp_web/pages/manage/user.html
index 7008be41..2e4543c8 100644
--- a/erp_web/pages/manage/user.html
+++ b/erp_web/pages/manage/user.html
@@ -70,6 +70,8 @@
             <input name="orgaId" id="orgaId" type="hidden"/>
             <input name="selectType" id="selectType" type="hidden"/>
             <input name="orgaUserRelId" id="orgaUserRelId" type="hidden"/>
+            <!--一个兼容input框，没有实际用处，但是必须存在-->
+            <input name="id" id="id" type="hidden"/>
         </div>
         <div class="fitem" style="padding:5px">
             <label id="userBlngOrgaDsplSeqLabel">用户排序&nbsp;&nbsp;</label>
diff --git a/erp_web/pages/manage/user_forselect.html b/erp_web/pages/manage/user_forselect.html
new file mode 100644
index 00000000..3e17f540
--- /dev/null
+++ b/erp_web/pages/manage/user_forselect.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>机构选择</title>
+    <meta charset="utf-8">
+    <!-- 指定以IE8的方式来渲染 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
+    <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
+    <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link type="text/css" rel="stylesheet" href="/css/common.css"/>
+    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/common/common.js"></script>
+</head>
+<body>
+<!-- 数据显示table -->
+<div>
+    <ul id="ttForSelect"></ul>
+</div>
+
+<script type="text/javascript">
+
+    $(function () {
+        $('#ttForSelect').tree({
+            url: '/user/getOrganizationUserTree',
+            animate: true,
+            onDblClick: function (node) {
+                //双击修改
+                forSelectUser(node);
+            }
+        });
+
+        function forSelectUser(node) {
+            var selectType=$("#selectType").val();
+            console.log(node);
+            if(!node.attributes.type){
+                return;
+            }
+            if(selectType=='principal'){
+                $("#principalName").val(node.text);
+                $("#principal").val(node.id);
+            }else if(selectType=='org'){
+                $("#orgAbr").val(node.text);
+                $("#orgaId").val(node.id);
+            }
+            $('#forSelectUserDlg').dialog('close');
+        }
+    });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/erp_web/pages/materials/materialcategory.html b/erp_web/pages/materials/materialcategory.html
index d319fa09..d4c4b611 100644
--- a/erp_web/pages/materials/materialcategory.html
+++ b/erp_web/pages/materials/materialcategory.html
@@ -82,6 +82,7 @@
     //初始化界面
     $(function () {
         var treeHeight=webH-35;
+        var id=$("#id").val();
         //初始化系统基础信息
         $('#tableData').datagrid({
             height: treeHeight,
@@ -107,7 +108,7 @@
         });
         $('#tableData').prev('.datagrid-view2').find(".datagrid-body").append("<ul id='tt'><ul>");
         $('#tt').tree({
-            url: '/materialCategory/getMaterialCategoryTree',
+            url: '/materialCategory/getMaterialCategoryTree?id='+id,
             animate: true,
             checkbox: true,
             onDblClick: function(node){
diff --git a/erp_web/pages/materials/materialcategory_forselect.html b/erp_web/pages/materials/materialcategory_forselect.html
index 0d82f32b..d519d8da 100644
--- a/erp_web/pages/materials/materialcategory_forselect.html
+++ b/erp_web/pages/materials/materialcategory_forselect.html
@@ -21,10 +21,19 @@
 </div>
 
 <script type="text/javascript">
-
+    /**
+     * create by: qiankunpingtai
+     * create time: 2019/3/14 11:41
+     * description:
+     * 为了防止当前节点选择父级目录为其子代节点造成闭环无法获取的问题
+     * 决定对树结构可选父级目录做一个筛选，只能为其上级目录
+     *
+     */
     $(function () {
+        var id=$("#id").val();
+        console.log(id);
         $('#ttForSelect').tree({
-            url: '/materialCategory/getMaterialCategoryTree',
+            url: '/materialCategory/getMaterialCategoryTree?id='+id,
             animate: true,
             onDblClick: function (node) {
                 //双击修改
diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx
index ff0ead0c..c6aa38c3 100644
Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ
diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
index 8e4f3e7b..18b7a1ae 100644
--- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java
+++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
@@ -83,7 +83,14 @@ public class BusinessConstants {
     /**
      * 商品类别根目录id
      * */
-    public static final Long MATERIAL_CATEGORY_ROOT_ID = 1L;
+    /**
+     * create by: qiankunpingtai
+     * create time: 2019/3/14 11:41
+     * description: 
+     * 为了使用户可以自己建初始目录，设定根目录的父级目录id为-1
+     *
+     */
+    public static final Long MATERIAL_CATEGORY_ROOT_PARENT_ID = -1L;
     /**
      * 商品类别状态
      * 0系统默认，1启用，2删除
@@ -101,10 +108,10 @@ public class BusinessConstants {
     public static final String ORGANIZATION_STCD_BUSINESS_TERMINATED = "4";
     public static final String ORGANIZATION_STCD_REMOVED = "5";
     /**
-     * 根机构编号
-     * 根机构编号默认为-1
+     * 根机构父级编号
+     * 根机父级构编号默认为-1
      * */
-    public static final String ORGANIZATION_ROOT_NO = "-1";
+    public static final String ORGANIZATION_ROOT_PARENT_NO = "-1";
     /**
      * 新增用户默认密码
      * */
diff --git a/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java b/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
index 6ec8daa4..66478149 100644
--- a/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
+++ b/src/main/java/com/jsh/erp/controller/MaterialCategoryController.java
@@ -92,9 +92,9 @@ public class MaterialCategoryController {
      * @return com.alibaba.fastjson.JSONArray
      */
     @RequestMapping(value = "/getMaterialCategoryTree")
-    public JSONArray getMaterialCategoryTree() throws Exception{
+    public JSONArray getMaterialCategoryTree(@RequestParam("id") Long id) throws Exception{
        JSONArray arr=new JSONArray();
-       List<TreeNode> materialCategoryTree = materialCategoryService.getMaterialCategoryTree();
+       List<TreeNode> materialCategoryTree = materialCategoryService.getMaterialCategoryTree(id);
        if(materialCategoryTree!=null&&materialCategoryTree.size()>0){
            for(TreeNode node:materialCategoryTree){
                String str=JSON.toJSONString(node);
diff --git a/src/main/java/com/jsh/erp/controller/OrganizationController.java b/src/main/java/com/jsh/erp/controller/OrganizationController.java
index 57bee4d0..9ec5f788 100644
--- a/src/main/java/com/jsh/erp/controller/OrganizationController.java
+++ b/src/main/java/com/jsh/erp/controller/OrganizationController.java
@@ -95,9 +95,9 @@ public class OrganizationController {
      * @return com.alibaba.fastjson.JSONArray
      */
     @RequestMapping(value = "/getOrganizationTree")
-    public JSONArray getOrganizationTree() throws Exception{
+    public JSONArray getOrganizationTree(@RequestParam("id") Long id) throws Exception{
        JSONArray arr=new JSONArray();
-       List<TreeNode> organizationTree= organizationService.getOrganizationTree();
+       List<TreeNode> organizationTree= organizationService.getOrganizationTree(id);
        if(organizationTree!=null&&organizationTree.size()>0){
            for(TreeNode node:organizationTree){
                String str=JSON.toJSONString(node);
diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index 390552fc..a79e3f86 100644
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -1,6 +1,7 @@
 package com.jsh.erp.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -10,6 +11,8 @@ import com.jsh.erp.datasource.entities.DepotEx;
 import com.jsh.erp.datasource.entities.SerialNumberEx;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.entities.UserEx;
+import com.jsh.erp.datasource.vo.TreeNode;
+import com.jsh.erp.datasource.vo.TreeNodeEx;
 import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.*;
 import org.slf4j.Logger;
@@ -311,5 +314,18 @@ public class UserController {
         userService.batDeleteUser(ids);
         return result;
     }
+    @RequestMapping("/getOrganizationUserTree")
+    public JSONArray getOrganizationUserTree()throws Exception{
+        JSONArray arr=new JSONArray();
+        List<TreeNodeEx> organizationUserTree= userService.getOrganizationUserTree();
+        if(organizationUserTree!=null&&organizationUserTree.size()>0){
+            for(TreeNodeEx node:organizationUserTree){
+                String str=JSON.toJSONString(node);
+                JSONObject obj=JSON.parseObject(str);
+                arr.add(obj) ;
+            }
+        }
+        return arr;
+    }
 
 }
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
index dbe7f6d7..d55a7328 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/MaterialCategoryMapperEx.java
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -24,8 +25,8 @@ public interface MaterialCategoryMapperEx {
             @Param("name") String name,
             @Param("parentId") Integer parentId);
 
-    List<TreeNode> getNodeTree();
-    List<TreeNode> getNextNodeTree(@Param("id") Long id);
+    List<TreeNode> getNodeTree(@Param("currentId")Long currentId);
+    List<TreeNode> getNextNodeTree(Map<String, Object> parameterMap);
 
     int addMaterialCategory(MaterialCategory mc);
 
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java
index bec06a91..20e41b20 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/OrganizationMapperEx.java
@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -17,8 +18,8 @@ import java.util.List;
 public interface OrganizationMapperEx {
 
 
-    List<TreeNode> getNodeTree();
-    List<TreeNode> getNextNodeTree(@Param("id") Long id);
+    List<TreeNode> getNodeTree(@Param("currentId")Long currentId);
+    List<TreeNode> getNextNodeTree(Map<String, Object> parameterMap);
 
     int addOrganization(Organization org);
 
diff --git a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
index 30ad71ee..a589d240 100644
--- a/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
+++ b/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java
@@ -3,6 +3,8 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.User;
 import com.jsh.erp.datasource.entities.UserEx;
 import com.jsh.erp.datasource.entities.UserExample;
+import com.jsh.erp.datasource.vo.TreeNode;
+import com.jsh.erp.datasource.vo.TreeNodeEx;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -31,4 +33,7 @@ public interface UserMapperEx {
                                                 @Param("loginame") String loginame);
 
     int batDeleteOrUpdateUser(@Param("ids") String ids[], @Param("status") byte status);
+
+    List<TreeNodeEx> getNodeTree();
+    List<TreeNodeEx> getNextNodeTree(Map<String, Object> parameterMap);
 }
\ No newline at end of file
diff --git a/src/main/java/com/jsh/erp/datasource/vo/NodeAttributes.java b/src/main/java/com/jsh/erp/datasource/vo/NodeAttributes.java
new file mode 100644
index 00000000..6b3d4a94
--- /dev/null
+++ b/src/main/java/com/jsh/erp/datasource/vo/NodeAttributes.java
@@ -0,0 +1,30 @@
+package com.jsh.erp.datasource.vo;
+
+/**
+ * Description
+ *
+ * @Author: qiankunpingtai
+ * @Date: 2019/3/13 18:11
+ */
+public class NodeAttributes {
+    //编号
+    private String no;
+    //类型
+    private Integer type;
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}
diff --git a/src/main/java/com/jsh/erp/datasource/vo/TreeNodeEx.java b/src/main/java/com/jsh/erp/datasource/vo/TreeNodeEx.java
new file mode 100644
index 00000000..8c938a53
--- /dev/null
+++ b/src/main/java/com/jsh/erp/datasource/vo/TreeNodeEx.java
@@ -0,0 +1,96 @@
+package com.jsh.erp.datasource.vo;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @Author: qiankunpingtai
+ * @Date: 2019/3/13 18:10
+ */
+public class TreeNodeEx {
+    /**
+     * id主键
+     * */
+    private Long id;
+    /**
+     * text显示的文本
+     * */
+    private String text;
+    /**
+     *state节点状态，'open' 或 'closed'，默认：'open'。如果为'closed'的时候，将不自动展开该节点。
+     * */
+    private String state="open";
+    /**
+     *iconCls 节点图标id
+     * */
+    private String iconCls;
+    /**
+     * checked 是否被选中
+     * */
+    private boolean checked;
+    /**
+     *attributes 自定义属性
+     * */
+    private NodeAttributes attributes;
+    /**
+     * children 子节点
+     * */
+    private List<TreeNode> children;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getIconCls() {
+        return iconCls;
+    }
+
+    public void setIconCls(String iconCls) {
+        this.iconCls = iconCls;
+    }
+
+    public boolean isChecked() {
+        return checked;
+    }
+
+    public void setChecked(boolean checked) {
+        this.checked = checked;
+    }
+
+    public NodeAttributes getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(NodeAttributes attributes) {
+        this.attributes = attributes;
+    }
+
+    public List<TreeNode> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<TreeNode> children) {
+        this.children = children;
+    }
+}
diff --git a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
index 8dc3854b..b4fa6bb0 100644
--- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
+++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
@@ -100,8 +100,8 @@ public class MaterialCategoryService {
      * @Param:
      * @return java.util.List<com.jsh.erp.datasource.vo.TreeNode>
      */
-    public List<TreeNode> getMaterialCategoryTree() throws Exception{
-       return materialCategoryMapperEx.getNodeTree();
+    public List<TreeNode> getMaterialCategoryTree(Long id) throws Exception{
+       return materialCategoryMapperEx.getNodeTree(id);
     }
     /**
      * create by: cjl
@@ -117,8 +117,8 @@ public class MaterialCategoryService {
             return 0;
         }
         if(mc.getParentid()==null){
-            //没有给定父级目录的id，默认设置父级目录为根目录
-            mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_ID);
+            //没有给定父级目录的id，默认设置父级目录为根目录的父目录
+            mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
         }
         //检查商品类型编号是否已存在
         checkMaterialCategorySerialNo(mc);
@@ -148,40 +148,16 @@ public class MaterialCategoryService {
         if(strArray.length<1){
             return 0;
         }
-        /**
-         * create by: qiankunpingtai
-         * create time: 2019/3/13 14:49
-         * description:
-         * 添加一个限制，根目录不允许删除
-         */
-        String rootIdStr=BusinessConstants.MATERIAL_CATEGORY_ROOT_ID.toString();
-        for(String s:strArray){
-            if(rootIdStr.equals(s)){
-                logger.error("异常码[{}],异常提示[{}],参数,id:[{}]",
-                        ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_CODE,
-                        ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_MSG,s);
-                throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_CODE,
-                        ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_DELETE_MSG);
-            }
-        }
+
        return materialCategoryMapperEx.batchDeleteMaterialCategoryByIds(updateDate,updater,strArray);
     }
     @Transactional(value = "transactionManager", rollbackFor = Exception.class)
     public int editMaterialCategory(MaterialCategory mc) {
-        /**
-         * create by: qiankunpingtai
-         * create time: 2019/3/13 14:49
-         * description:
-         * 添加一个限制根目录不允许修改
-         */
-        if(BusinessConstants.MATERIAL_CATEGORY_ROOT_ID.equals(mc.getId())){
-            logger.error("异常码[{}],异常提示[{}],参数,id:[{}]",
-                    ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_EDIT_CODE,
-                    ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_EDIT_MSG,mc.getId());
-            throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_EDIT_CODE,
-                    ExceptionConstants.MATERIAL_CATEGORY_ROOT_NOT_SUPPORT_EDIT_MSG);
-
+        if(mc.getParentid()==null){
+            //没有给定父级目录的id，默认设置父级目录为根目录的父目录
+            mc.setParentid(BusinessConstants.MATERIAL_CATEGORY_ROOT_PARENT_ID);
         }
+
         //检查商品类型编号是否已存在
         checkMaterialCategorySerialNo(mc);
         //更新时间
diff --git a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
index e21f5cfc..fab3b5d4 100644
--- a/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
+++ b/src/main/java/com/jsh/erp/service/organization/OrganizationService.java
@@ -82,7 +82,7 @@ public class OrganizationService {
          * 未指定父级机构的时候默认为根机构
          * */
         if(StringUtil.isEmpty(org.getOrgParentNo())){
-            org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_NO);
+            org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_PARENT_NO);
         }
         return organizationMapperEx.addOrganization(org);
     }
@@ -103,13 +103,13 @@ public class OrganizationService {
          * 未指定父级机构的时候默认为根机构
          * */
         if(StringUtil.isEmpty(org.getOrgParentNo())){
-            org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_NO);
+            org.setOrgParentNo(BusinessConstants.ORGANIZATION_ROOT_PARENT_NO);
         }
         return organizationMapperEx.editOrganization(org);
     }
 
-    public List<TreeNode> getOrganizationTree()throws Exception {
-        return organizationMapperEx.getNodeTree();
+    public List<TreeNode> getOrganizationTree(Long id)throws Exception {
+        return organizationMapperEx.getNodeTree(id);
     }
 
     public List<Organization> findById(Long id) throws Exception{
diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java
index 4464a9d3..24c53abc 100644
--- a/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -10,6 +10,8 @@ import com.jsh.erp.datasource.entities.UserEx;
 import com.jsh.erp.datasource.entities.UserExample;
 import com.jsh.erp.datasource.mappers.UserMapper;
 import com.jsh.erp.datasource.mappers.UserMapperEx;
+import com.jsh.erp.datasource.vo.TreeNode;
+import com.jsh.erp.datasource.vo.TreeNodeEx;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.orgaUserRel.OrgaUserRelService;
 import com.jsh.erp.utils.ExceptionCodeConstants;
@@ -398,4 +400,7 @@ public class UserService {
         }
     }
 
+    public List<TreeNodeEx> getOrganizationUserTree() {
+        return userMapperEx.getNodeTree();
+    }
 }
diff --git a/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml b/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml
index f698df1b..dc32af67 100644
--- a/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml
+++ b/src/main/resources/mapper_xml/MaterialCategoryMapperEx.xml
@@ -33,14 +33,14 @@
     <resultMap id="BaseTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNode">
         <result column="id" property="id"/>
         <result column="name" property="text"/>
-        <collection column="id" property="children" javaType="java.util.ArrayList"
+        <collection column="{currentId=currentId,id=id}" property="children" javaType="java.util.ArrayList"
                     ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
     </resultMap>
 
     <resultMap id="NextTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNode">
         <result column="id" property="id"/>
         <result column="name" property="text"/>
-        <collection column="id" property="children" javaType="java.util.ArrayList"
+        <collection column="{currentId=currentId,id=id}" property="children" javaType="java.util.ArrayList"
                     ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
     </resultMap>
 
@@ -50,19 +50,25 @@
 
     <select id="getNextNodeTree" resultMap="NextTreeResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,#{currentId} as currentId
         FROM jsh_materialcategory
         WHERE ParentId = #{id}
+        <if test="currentId != null">
+            and id !=#{currentId}
+        </if>
         and status !='2'
         order by sort asc
     </select>
 
     <select id="getNodeTree" resultMap="BaseTreeResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,#{currentId} as currentId
         FROM jsh_materialcategory
         WHERE ParentId = -1
         and status !='2'
+        <if test="currentId != null">
+            and id !=#{currentId}
+        </if>
         order by sort asc
     </select>
     <insert id="addMaterialCategory" parameterType="com.jsh.erp.datasource.entities.MaterialCategory"
diff --git a/src/main/resources/mapper_xml/OrganizationMapperEx.xml b/src/main/resources/mapper_xml/OrganizationMapperEx.xml
index 8eef8c55..10e1b744 100644
--- a/src/main/resources/mapper_xml/OrganizationMapperEx.xml
+++ b/src/main/resources/mapper_xml/OrganizationMapperEx.xml
@@ -6,7 +6,7 @@
         <result column="id" property="id"/>
         <result column="org_abr" property="text"/>
         <result column="org_no" property="attributes"/>
-        <collection column="org_no" property="children" javaType="java.util.ArrayList"
+        <collection column="{currentId=currentId,org_no=org_no}" property="children" javaType="java.util.ArrayList"
                     ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
     </resultMap>
 
@@ -14,7 +14,7 @@
         <result column="id" property="id"/>
         <result column="org_abr" property="text"/>
         <result column="org_no" property="attributes"/>
-        <collection column="org_no" property="children" javaType="java.util.ArrayList"
+        <collection column="{currentId=currentId,org_no=org_no}" property="children" javaType="java.util.ArrayList"
                     ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
     </resultMap>
 
@@ -24,18 +24,24 @@
 
     <select id="getNextNodeTree" resultMap="NextTreeResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,#{currentId} as currentId
         FROM jsh_organization
         WHERE org_parent_no = #{org_no}
+        <if test="currentId != null">
+            and id !=#{currentId}
+        </if>
         and org_stcd !='5'
         order by sort asc
     </select>
 
     <select id="getNodeTree" resultMap="BaseTreeResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,#{currentId} as currentId
         FROM jsh_organization
         WHERE org_parent_no = -1
+        <if test="currentId != null">
+            and id !=#{currentId}
+        </if>
         and org_stcd !='5'
         order by sort asc
     </select>
diff --git a/src/main/resources/mapper_xml/UserMapperEx.xml b/src/main/resources/mapper_xml/UserMapperEx.xml
index 201541c3..1a4c5f70 100644
--- a/src/main/resources/mapper_xml/UserMapperEx.xml
+++ b/src/main/resources/mapper_xml/UserMapperEx.xml
@@ -132,4 +132,56 @@
         </foreach>
         )
     </update>
+    <resultMap id="BaseTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNodeEx">
+        <result column="id" property="id"/>
+        <result column="text" property="text"/>
+        <association property="attributes" javaType="com.jsh.erp.datasource.vo.NodeAttributes">
+            <id column="orgNo" property="no"></id>
+            <result column="type" property="type"></result>
+        </association>
+        <collection column="{orgId=id,orgNo=orgNo}" property="children" javaType="java.util.ArrayList"
+                    ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
+    </resultMap>
+
+    <resultMap id="NextTreeResultMap" type="com.jsh.erp.datasource.vo.TreeNodeEx">
+        <result column="id" property="id"/>
+        <result column="text" property="text"/>
+        <result column="iconCls" property="iconCls"/>
+        <association property="attributes" javaType="com.jsh.erp.datasource.vo.NodeAttributes">
+            <id column="orgNo" property="no"></id>
+            <result column="type" property="type"></result>
+        </association>
+        <collection column="{orgId=id,orgNo=orgNo}" property="children" javaType="java.util.ArrayList"
+                    ofType="com.jsh.erp.datasource.vo.TreeNode" select="getNextNodeTree"/>
+    </resultMap>
+
+    <select id="getNextNodeTree" resultMap="NextTreeResultMap">
+        select id ,	text,orgNo,sort ,iconCls,type from (
+            SELECT
+            org.id, org.org_abr as text,org.org_no as orgNo,org.sort as sort,null as iconCls,'0' as type
+            FROM jsh_organization org
+            WHERE org.org_parent_no = #{orgNo}
+            and org.org_stcd !='5'
+            union all
+            select
+            user.id,user.username as text, null as orgNo,rel.user_blng_orga_dspl_seq as sort,'icon-user' as iconCls,'1' as type
+            from jsh_user user,jsh_orga_user_rel rel
+            where
+            1=1
+            and user.id=rel.user_id
+            and rel.orga_id=#{orgId}
+            and rel.delete_flag !='1'
+            and user.status not in ('1','2')
+          ) node
+          order by sort asc
+    </select>
+
+    <select id="getNodeTree" resultMap="BaseTreeResultMap">
+        SELECT
+         id, org_abr as text,org_no as orgNo,'0' as type
+        FROM jsh_organization
+        WHERE org_parent_no = -1
+        and org_stcd !='5'
+        order by sort asc
+    </select>
 </mapper>
\ No newline at end of file