diff --git a/htmlweb/web/backstage/system/department/add.html b/htmlweb/web/backstage/system/department/add.html
index 6af1894b..f53da652 100644
--- a/htmlweb/web/backstage/system/department/add.html
+++ b/htmlweb/web/backstage/system/department/add.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>部门主表</title>
+	<title>公司主表</title>
 
 
 
@@ -25,9 +25,9 @@
 								<div class="row">
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">* 部门名称:</label>
+											<label class="col-sm-3 control-label is-required">* 公司名称:</label>
 											<div class="col-sm-9">
-												<input  name="departname" id="departname" class="form-control" placeholder="部门名称" class="form-control" type="text" maxlength='100' required>
+												<input  name="departname" id="departname" class="form-control" placeholder="公司名称" class="form-control" type="text" maxlength='100' required>
 											</div>
 										</div>
 									</div>
@@ -45,9 +45,9 @@
 								<div class="row">
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">* 部门描述:</label>
+											<label class="col-sm-3 control-label is-required">* 公司描述:</label>
 											<div class="col-sm-9">
-												<input  name="departdesc" id="departdesc" class="form-control"   placeholder="部门描述" class="form-control" type="text" maxlength='100' required>
+												<input  name="departdesc" id="departdesc" class="form-control"   placeholder="公司描述" class="form-control" type="text" maxlength='100' required>
 											</div>
 										</div>
 									</div>
@@ -81,9 +81,9 @@
 									</div>
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">部门地址:</label>
+											<label class="col-sm-3 control-label is-required">公司地址:</label>
 											<div class="col-sm-9">
-												<input  name="departaddress" id="departaddress" class="form-control"   placeholder="部门地址" class="form-control" type="text" maxlength='100' required>
+												<input  name="departaddress" id="departaddress" class="form-control"   placeholder="公司地址" class="form-control" type="text" maxlength='100' required>
 											</div>
 										</div>
 									</div>
@@ -91,20 +91,47 @@
 								<div class="row">
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">机构编号:</label>
+											<label class="col-sm-3 control-label is-required">业务主体编码:</label>
 											<div class="col-sm-9">
-												<input type="text" id="deptno" name="deptno" placeholder="机构编号" data-required="1" class="form-control" required checkENG="true" minlength="2" maxlength="50"/>
+												<input type="text" id="deptno" name="deptno" placeholder="业务主体编码" data-required="1" class="form-control" required  minlength="2" maxlength="50"/>
 
 											</div>
 										</div>
 									</div>
 									<div class="col-sm-6">
 										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">企业编码:</label>
+											<div class="col-sm-9">
+												<input type="text" id="description" name="description" placeholder="企业编码" data-required="1" class="form-control" required  minlength="2" maxlength="50"/>
 
+											</div>
 										</div>
 									</div>
 								</div>
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">业务主体/租户:</label>
+											<div class="col-sm-9">
+												<div class="input-group">
+													<div class="radio i-checks">
+														<label>
+															<input type="radio" id="typedept1" checked="" value="1"  name="typedept"> <i></i>业务主体
+														</label>
+														<label>
+															<input type="radio" id="typedept0" value="0" name="typedept"> <i></i>租户
+														</label>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+									<div class="col-sm-6">
+										<div class="form-group">
 
+										</div>
+									</div>
+								</div>
 								<div class="row">
 									<div class="form-group">
 										<div class="col-sm-offset-5">
diff --git a/htmlweb/web/backstage/system/department/edit.html b/htmlweb/web/backstage/system/department/edit.html
index 86d92802..745b6ea7 100644
--- a/htmlweb/web/backstage/system/department/edit.html
+++ b/htmlweb/web/backstage/system/department/edit.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>部门主表</title>
+	<title>公司主表</title>
 
 
 
@@ -27,9 +27,9 @@
 								<div class="row">
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">* 部门名称:</label>
+											<label class="col-sm-3 control-label is-required">* 公司名称:</label>
 											<div class="col-sm-9">
-												<input  name="departname" id="departname" class="form-control"   placeholder="部门名称" class="form-control" type="text"  maxlength='100' required>
+												<input  name="departname" id="departname" class="form-control"   placeholder="公司名称" class="form-control" type="text"  maxlength='100' required>
 											</div>
 										</div>
 									</div>
@@ -47,9 +47,9 @@
 								<div class="row">
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">* 部门描述:</label>
+											<label class="col-sm-3 control-label is-required">* 公司描述:</label>
 											<div class="col-sm-9">
-												<input  name="departdesc" id="departdesc" class="form-control"   placeholder="部门描述" class="form-control" type="text"  maxlength='100' required>
+												<input  name="departdesc" id="departdesc" class="form-control"   placeholder="公司描述" class="form-control" type="text"  maxlength='100' required>
 											</div>
 										</div>
 									</div>
@@ -84,9 +84,9 @@
 									</div>
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">部门地址:</label>
+											<label class="col-sm-3 control-label is-required">公司地址:</label>
 											<div class="col-sm-9">
-												<input  name="departaddress" id="departaddress" class="form-control"   placeholder="部门地址" class="form-control" type="text"  maxlength='100' required>
+												<input  name="departaddress" id="departaddress" class="form-control"   placeholder="公司地址" class="form-control" type="text"  maxlength='100' required>
 											</div>
 										</div>
 									</div>
@@ -94,13 +94,41 @@
 								<div class="row">
 									<div class="col-sm-6">
 										<div class="form-group">
-											<label class="col-sm-3 control-label is-required">机构编号:</label>
+											<label class="col-sm-3 control-label is-required">业务主体编码:</label>
 											<div class="col-sm-9">
-												<input type="text" id="deptno" name="deptno" placeholder="机构编号" data-required="1" readonly="readonly" class="form-control" required checkENG="true" minlength="2" maxlength="50"/>
+												<input type="text" id="deptno" name="deptno" placeholder="业务主体编码" data-required="1" class="form-control" required  minlength="2" maxlength="50"/>
 
 											</div>
 										</div>
 									</div>
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">企业编码:</label>
+											<div class="col-sm-9">
+												<input type="text" id="description" name="description" placeholder="企业编码" data-required="1" class="form-control" required  minlength="2" maxlength="50"/>
+
+											</div>
+										</div>
+									</div>
+								</div>
+								<div class="row">
+									<div class="col-sm-6">
+										<div class="form-group">
+											<label class="col-sm-3 control-label is-required">业务主体/租户:</label>
+											<div class="col-sm-9">
+												<div class="input-group">
+													<div class="radio i-checks">
+														<label>
+															<input type="radio" id="typedept1" value="1"  name="typedept"> <i></i>业务主体
+														</label>
+														<label>
+															<input type="radio" id="typedept0" value="0" name="typedept"> <i></i>租户
+														</label>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
 									<div class="col-sm-6">
 										<div class="form-group">
 
@@ -180,8 +208,8 @@
 
 	$(document).ready(function () {
 
-		parent.axgetXiaoyao("${ctx}/backstage/admin/department/showDeptJsTree" ,null,false,function (data) {
-			_deptTree = $.fn.zTree.init($("#departZtreeUl"),setting, data);
+		parent.axgetXiaoyao("${ctx}/backstage/admin/department/showDeptJsTree" ,null,false,function (datatree) {
+			_deptTree = $.fn.zTree.init($("#departZtreeUl"),setting, datatree);
 			_deptTree.expandAll(true);
 
 
@@ -194,6 +222,8 @@
 
 					$("#departdesc").val(data.data.departdesc);
 					$("#deptno").val(data.data.deptno);
+					$("#description").val(data.data.description);
+
 
 					var node = _deptTree.getNodesByParam("id",String(data.data.parentid));
 
@@ -209,6 +239,12 @@
 						$("input:radio[name='enabled']").eq(1).attr('checked',true);
 					}
 
+					if(data.data.typedept == 1){
+						$("input:radio[name='typedept']").eq(0).attr('checked',true);
+					}else if(data.data.typedept == 0){
+						$("input:radio[name='typedept']").eq(1).attr('checked',true);
+					}
+
 					checkeradio();
 
 					$("#sorting").val(data.data.sorting);
diff --git a/htmlweb/web/backstage/system/department/list.html b/htmlweb/web/backstage/system/department/list.html
index 3f0d4f7c..2e56de05 100644
--- a/htmlweb/web/backstage/system/department/list.html
+++ b/htmlweb/web/backstage/system/department/list.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>部门主表</title>
+	<title>公司主表</title>
 
 
 
@@ -53,7 +53,7 @@
 						<input name='search_parentid'  id='search_parentid' type="hidden"/>
 
 						<div class="form-group">
-							<input name='search_departname'  id='search_departname'  class='form-control' placeholder='部门名称'/>
+							<input name='search_departname'  id='search_departname'  class='form-control' placeholder='公司名称'/>
 						</div>
 						<div class="form-group">
 							<select class="form-control input-s-sm inline" name="search_enabled" id="search_enabled">
@@ -89,12 +89,43 @@
 	</div>
 
 </div>
+
+
+<!-- 展示流程图的 窗口 -->
+<div id="modal_flowable_list" class="modal fade" aria-hidden="true">
+	<div class="modal-dialog" role="document" style="width: auto">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<h4 class="modal-title" id="flowImgModalLabel">部署工作流：<span id="flowName"></span></h4>
+			</div>
+
+			<div class="modal-body">
+				<form id="candidateUserFrom">
+
+					<input type="hidden" name="processdefinitionid" id="processdefinitionid">
+					<input type="hidden" name="caProcessdefinitionid" id="caProcessdefinitionid">
+					<div class="form-group">
+						<table id="flowable_list" ></table>
+					</div>
+
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" onclick="saveUserCandidateForm()" class="btn btn-primary">设置</button>
+				<button type="button" class="btn btn-default" data-dismiss="modal">关闭窗口</button>
+			</div>
+
+		</div>
+	</div>
+</div>
 <#include "/head/footlist.html" />
 <script src="${ctx}/static/js/plugins/jqueryzTree/js/jquery.ztree.all.min.js"></script>
 
 </body>
 </html>
 	<script type="text/javascript">
+		var _tableListDefinition;
 		var _deptTree;
 		var setting = {
 			data: {
@@ -124,12 +155,61 @@
 		});
 
 
+		function playFlow(cc,dd){
+
+			$("#modal_flowable_list").modal();
+			$("#modal_flowable_list").css("z-index",(parent.getMaxZIndex() + 1));
 
+			_tableListDefinition.bootstrapTable('refreshOptions',{pageNumber:1});
+		}
 	var _tableListDepartment;
 	var jsptoolbar = '';
 	var jspOperation = '';
 	jQuery(document).ready(function($){
 
+		_tableListDefinition = $('#flowable_list').bootstrapTable({
+			url: '${ctx}/flow/definition/latestList'  ,
+			pagination: true,          //是否显示分页（*）
+			pageNumber:1,            //初始化加载第一页，默认第一页
+			pageSize: 10,            //每页的记录行数（*）
+			sidePagination: "server",
+			height: "100%",						pageList: [10, 25, 50],
+			ajaxOptions:{
+				headers: {"logintoken": parent.getLoginToken()}
+			},
+			queryParams: function queryParams(params) {
+				return {
+					sortorder: params.order,
+					sortname: params.sort,
+					pageSize: params.limit,
+					currPage: (params.offset / params.limit) + 1
+				};
+			},
+			responseHandler:function(res){
+				return{"rows": res.data.list, "total": res.data.totalCount};
+			},
+			columns: [
+				{ width:150,valign: "middle",field:'id',title:'流程定义ID',sortable:false},
+				{ width:150,valign: "middle",field:'name',title:'流程名称',sortable:false},
+				{ width:150,valign: "middle",field:'flowKey',title:'流程key',sortable:false},
+				{ width:150,valign: "middle",field:'description',title:'流程描述',sortable:false},
+				{
+					width:90,
+					field: 'id',
+					title: '关联的流程',
+					formatter:function(value,oData,index) {
+
+						var listOperation = '无';
+
+						if($("#caProcessdefinitionid").val() == oData.id){
+							listOperation = '<a class="btn btn-info btn-circle btn-lg" href="#"> </a>';
+						}
+						return listOperation;
+					}
+				}
+			]
+		});
+
 		initDepartTree();
 		parent.axgetXiaoyao("${ctx}/backstage/admin/user/toolsbarOperation?" + "resourceid=${resourceid}",null,true ,
 			function(data){
@@ -168,23 +248,42 @@
 						},
 						columns: [
 							{checkbox: true},
+							{ width:150,valign: "middle",field:'departname',title:'公司名称',sortable:true},
+							{ width:150,valign: "middle",field:'enabled',title:'公司类型',sortable:true,
+								formatter:function (value,oData,index) {
+									var listOperation = "";
+									if(oData.typedept == 1){
+										listOperation = "主体";
+									}else {
+										listOperation = "租户";
+									}
+									return listOperation;
+								}
+							},
+							{ width:150,valign: "middle",field:'deptno',title:'业务主体编码',sortable:true},
+							{ width:150,valign: "middle",field:'description',title:'企业编码',sortable:true},
+							{ width:50,valign: "middle",field:'processdefinitionid',title:'是否关联流程',sortable:false,
 
-								{ width:150,valign: "middle",field:'departname',title:'部门名称',sortable:true},
-								{ width:150,valign: "middle",field:'departdesc',title:'部门描述',sortable:true},
-								{ width:150,valign: "middle",field:'enabled',title:'是否启用',sortable:true,
-									formatter:function (value,oData,index) {
-										var listOperation = "";
+								formatter:function(value,oData,index) {
+									var listOperation = oData.processdefinitionid == null ? "否" : "是";
 
-										if(oData.enabled == 1){
-											listOperation = "启用";
-										}else {
-											listOperation = "停用";
-										}
+									return listOperation;
+								}
+							},
+							{ width:150,valign: "middle",field:'enabled',title:'是否启用',sortable:true,
+								formatter:function (value,oData,index) {
+									var listOperation = "";
 
-										return listOperation;
+									if(oData.enabled == 1){
+										listOperation = "启用";
+									}else {
+										listOperation = "停用";
 									}
-								},
-								{ width:150,valign: "middle",field:'sorting',title:'排序',sortable:true},
+
+									return listOperation;
+								}
+							},
+							{ width:150,valign: "middle",field:'sorting',title:'排序',sortable:true},
 							{
 								width:200,
 								field: 'id',
@@ -196,6 +295,8 @@
 									$(jspOperation).each(function (i, toolbar) {
 										listOperation = listOperation + "<a href=\"javascript:" + toolbar.actionmethod + "('${resourceid}','" + tempid + "');\" class=\"btn " + toolbar.img + " btn-xs\")><i class=\"fa " + toolbar.methodkey + "\"></i> " + toolbar.text + " </a>&nbsp;&nbsp;";
 									});
+
+									listOperation = listOperation + "<a href=\"javascript:playFlow('" + oData.processdefinitionid + "','" + oData.id + "');\" class=\"btn btn-success btn-xs\")><i class=\"fa fa-map-signs\"></i>查看流程</a>&nbsp;&nbsp;";
 									return listOperation;
 								}
 							}
@@ -222,11 +323,11 @@
 		});
 	}
 	function _useradd(sourceid){
-		parent._xiaoyaoOpenMenuTab('${ctx}/backstage/admin/departmentHtml/toSave',"添加部门",sourceid);
+		parent._xiaoyaoOpenMenuTab('${ctx}/backstage/admin/departmentHtml/toSave',"添加公司",sourceid);
 	}
 	function updateData(sourceid,str){
 		var url = '${ctx}/backstage/admin/departmentHtml/toEdit/' + str ;
-		parent._xiaoyaoOpenMenuTab(url,"修改部门",sourceid + "_edit");
+		parent._xiaoyaoOpenMenuTab(url,"修改公司",sourceid + "_edit");
 	}
 	function _useredit(sourceid){
 		var str = getIdSelections() + "";
diff --git a/htmlweb/web/backstage/system/user/add.html b/htmlweb/web/backstage/system/user/add.html
index 180222fc..d7721da1 100644
--- a/htmlweb/web/backstage/system/user/add.html
+++ b/htmlweb/web/backstage/system/user/add.html
@@ -121,7 +121,7 @@
                                             <div class="col-sm-9">
                                                 <div class="input-group">
                                                     <input name="treeDeptName" id="treeDeptName" type="text" placeholder="请选择归属部门" onclick="selectDeptTree()" readonly="true" required class="form-control">
-                                                    <input  name="departmentId" id="departmentId"  type="hidden">
+                                                    <input  name="departmentIds" id="departmentIds"  type="hidden">
                                                     <span class="input-group-addon"><i class="fa fa-search"></i></span>
                                                 </div>
                                             </div>
@@ -154,11 +154,7 @@
                                             </div>
                                         </div>
                                         <div class="form-group">
-                                            <label class="col-sm-3 control-label"> 关联公司：</label>
-                                            <div class="col-sm-9">
-                                                <select data-placeholder="请选择公司" id="tenantselect" name="tenantselect" class="chosen-select" multiple style="width:350px;" tabindex="4">
-                                                </select>
-                                            </div>
+
                                         </div>
                                     </div>
 
@@ -294,8 +290,41 @@
             simpleData: {
                 enable: true
             }
-        }, callback: {onClick: zTreeOnClick }
+        },
+        check: {
+            enable: true,
+            chkStyle: "checkbox",
+            chkboxType: { "Y": "", "N": "" }
+        },
+        callback: {
+            onCheck: zOnCheck
+        }
     };
+    // 全局变量
+    var checks = [];
+
+    // 复选框调用
+    function zOnCheck(event, treeId, treeNode) {
+        if (treeNode.checked) {//如果是选中节点
+
+                checks.push({id: treeNode.id, name: treeNode.name});
+
+        } else {//如果是取消选中
+
+                removeCheck(treeNode.id);
+
+        }
+        console.log(checks)
+    }
+    // 移除元素
+    function removeCheck(chkid) {
+        $.each(checks, function (idx, item) {
+            if (item != undefined && item.id == chkid) {
+                checks.splice(idx, 1);
+            }
+        })
+    }
+
     function showuserIconModel() {
         $userIconModel.modal();
         $userIconModel.css("z-index",(parent.getMaxZIndex() + 1));
@@ -308,6 +337,22 @@
         $modalDeptTree.css("z-index",(parent.getMaxZIndex() + 1));
     }
     function closedept(){
+        var tempName = "";
+        var tempId = "";
+        $.each(checks,function(name,anArray) {
+
+            if(tempName.length > 1){
+                tempName = tempName + "," + anArray.name;
+                tempId = tempId + "," + anArray.id;
+            }else{
+                tempName = tempName +  anArray.name;
+                tempId = tempId +  anArray.id;
+            }
+        });
+
+        $("#treeDeptName").val(tempName);
+        $("#departmentIds").val(tempId);
+
         $modalDeptTree.modal('hide');
     }
     //折叠ibox
@@ -323,13 +368,7 @@
         $(this).hide();
         $("#collapes_linkopen").show();
     });
-    function zTreeOnClick(event, treeId, treeNode) {
-
-        $("#treeDeptName").val(treeNode.name);
-        $("#departmentId").val(treeNode.id);
-        closedept();
 
-    }
     var selectConfig = {
         '.chosen-select': {},
         '.chosen-select-deselect': {
@@ -355,16 +394,7 @@
         changeRoles(userdepartmentId);
         changePost(userdepartmentId);
 
-        parent.axgetXiaoyao("${ctx}/backstage/admin/tenant/listall",null,false,function (data) {
 
-            if(data.code == "OK"){
-                console.log(data.data)
-                $.each(data.data,function(name,anArray) {
-                    console.log(anArray)
-                    $("#tenantselect").append("<option value='" + anArray.id + "'>" + anArray.name + "</option>");
-                });
-            }
-        });
 
 
         var config = {
diff --git a/htmlweb/web/backstage/system/user/edit.html b/htmlweb/web/backstage/system/user/edit.html
index 6ec9a266..07196e9a 100644
--- a/htmlweb/web/backstage/system/user/edit.html
+++ b/htmlweb/web/backstage/system/user/edit.html
@@ -123,7 +123,7 @@
                                             <div class="col-sm-9">
                                                 <div class="input-group">
                                                     <input name="treeDeptName" id="treeDeptName" type="text" placeholder="请选择归属部门" onclick="selectDeptTree()" readonly="true" required class="form-control">
-                                                    <input  name="departmentId" id="departmentId"  type="hidden">
+                                                    <input  name="departmentIds" id="departmentIds"  type="hidden">
                                                     <span class="input-group-addon"><i class="fa fa-search"></i></span>
                                                 </div>
                                             </div>
@@ -157,11 +157,7 @@
                                             </div>
                                         </div>
                                         <div class="form-group">
-                                            <label class="col-sm-3 control-label"> 关联公司：</label>
-                                            <div class="col-sm-9">
-                                                <select data-placeholder="请选择公司" id="tenantselect" name="tenantselect" class="chosen-select" multiple style="width:350px;" tabindex="4">
-                                                </select>
-                                            </div>
+
                                         </div>
                                     </div>
 
@@ -286,8 +282,40 @@
             simpleData: {
                 enable: true
             }
-        }, callback: {onClick: zTreeOnClick }
+        },
+        check: {
+            enable: true,
+            chkStyle: "checkbox",
+            chkboxType: { "Y": "", "N": "" }
+        },
+        callback: {
+            onCheck: zOnCheck
+        }
     };
+    // 全局变量
+    var checks = [];
+
+    // 复选框调用
+    function zOnCheck(event, treeId, treeNode) {
+        if (treeNode.checked) {//如果是选中节点
+
+            checks.push({id: treeNode.id, name: treeNode.name});
+
+        } else {//如果是取消选中
+
+            removeCheck(treeNode.id);
+
+        }
+        console.log(checks)
+    }
+    // 移除元素
+    function removeCheck(chkid) {
+        $.each(checks, function (idx, item) {
+            if (item != undefined && item.id == chkid) {
+                checks.splice(idx, 1);
+            }
+        })
+    }
     var selectConfig = {
         '.chosen-select': {},
         '.chosen-select-deselect': {
@@ -316,6 +344,21 @@
         $modalDeptTree.css("z-index",(parent.getMaxZIndex() + 1));
     }
     function closedept(){
+        var tempName = "";
+        var tempId = "";
+        $.each(checks,function(name,anArray) {
+
+            if(tempName.length > 1){
+                tempName = tempName + "," + anArray.name;
+                tempId = tempId + "," + anArray.id;
+            }else{
+                tempName = tempName +  anArray.name;
+                tempId = tempId +  anArray.id;
+            }
+        });
+
+        $("#treeDeptName").val(tempName);
+        $("#departmentIds").val(tempId);
         $modalDeptTree.modal('hide');
     }
     //折叠ibox
@@ -331,13 +374,7 @@
         $(this).hide(); F
         $("#collapes_linkopen").show();
     });
-    function zTreeOnClick(event, treeId, treeNode) {
 
-        $("#treeDeptName").val(treeNode.name);
-        $("#departmentId").val(treeNode.id);
-        closedept();
-
-    }
 
     $(document).ready(function () {
 
@@ -347,20 +384,6 @@
         changePost(userdepartmentId);
 
 
-        parent.axgetXiaoyao("${ctx}/backstage/admin/tenant/listall",null,false,function (data) {
-
-            if(data.code == "OK"){
-                console.log(data.data)
-                $.each(data.data,function(name,anArray) {
-                    console.log(anArray)
-                    $("#tenantselect").append("<option value='" + anArray.id + "'>" + anArray.name + "</option>");
-                });
-            }
-        });
-
-
-
-
         parent.axgetXiaoyao("${ctx}/backstage/admin/department/showDeptJsTree",null,false,function (data) {
             _deptTree = $.fn.zTree.init($("#departZtreeUl"),setting, data);
             _deptTree.expandAll(true);
@@ -379,16 +402,23 @@
                 $("#email").val(usermodel.email);
                 $("#nationid").val(usermodel.nationid);
 
-               var nodeId = usermodel.departmentId;
-
-               if(undefined != nodeId && null != nodeId){
-                   var node = _deptTree.getNodeByParam("id",nodeId);
-                   _deptTree.selectNode(node);
-               }
+                var tempId = "";
+                $.each(usermodel.deptlist,function (index,deptDate){
+                    if(null != deptDate){
+                        var node = _deptTree.getNodeByParam("id",deptDate.id);
+                        // _deptTree.selectNode(node);
+                        _deptTree.checkNode(node,true,true,true);
+                    }
+                    if(tempId.length > 1){
+                        tempId = tempId + "," + deptDate.id;
+                    }else{
+                        tempId = tempId +  deptDate.id;
+                    }
+                });
 
+                $("#departmentIds").val(tempId);
 
                 $("#treeDeptName").val(usermodel.departname);
-                $("#departmentId").val(usermodel.departmentId);
 
                 if(usermodel.enabled == 1){
                     $("input:radio[name='enabled']").eq(0).attr('checked',true);
@@ -402,12 +432,6 @@
                     $("input:radio[name='usex']").eq(1).attr('checked',true);
                 }
 
-                $.each(usermodel.tenantList,function(name,anArray) {
-                    $("#tenantselect option[value='" + anArray.id + "']").attr("selected",true);
-                });
-
-
-
             }else{
                 parent.toastr.error("非法请求。");
                 //rolesback();
