diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysOfficeMapper.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysOfficeMapper.java
new file mode 100644
index 0000000..5b9727e
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/dao/SysOfficeMapper.java
@@ -0,0 +1,13 @@
+package com.tamguo.modules.sys.dao;
+
+import java.util.List;
+
+import com.tamguo.config.dao.SuperMapper;
+import com.tamguo.modules.sys.model.SysOfficeEntity;
+import com.tamguo.modules.sys.model.condition.SysOfficeCondition;
+
+public interface SysOfficeMapper extends SuperMapper<SysOfficeEntity>{
+
+	List<SysOfficeEntity> listData(SysOfficeCondition condition);
+
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java
index d16ecc3..7b3ca43 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java
@@ -5,6 +5,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.tamguo.config.dao.SuperEntity;
+import com.tamguo.modules.sys.model.enums.SysCompanyStatusEnum;
 
 /**
  * The persistent class for the sys_company database table.
@@ -14,6 +15,7 @@ import com.tamguo.config.dao.SuperEntity;
 public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	private String code;
 	private String name;
 	private String fullName;
 	private String type;
@@ -27,6 +29,7 @@ public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements S
 	private Boolean isLeaf;
 	private Integer treeLevel;
 	private Date updateDate;
+	private SysCompanyStatusEnum status;
 	
 	public String getName() {
 		return name;
@@ -109,5 +112,17 @@ public class SysCompanyEntity extends SuperEntity<SysCompanyEntity> implements S
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
 	}
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public SysCompanyStatusEnum getStatus() {
+		return status;
+	}
+	public void setStatus(SysCompanyStatusEnum status) {
+		this.status = status;
+	}
 
 }
\ No newline at end of file
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java
new file mode 100644
index 0000000..2980671
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysOfficeEntity.java
@@ -0,0 +1,111 @@
+package com.tamguo.modules.sys.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.tamguo.config.dao.SuperEntity;
+import com.tamguo.modules.sys.model.enums.SysOfficeStatusEnum;
+import com.tamguo.modules.sys.model.enums.SysOfficeTypeEnum;
+
+@TableName(value="sys_office")
+public class SysOfficeEntity extends SuperEntity<SysOfficeEntity> implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+	
+	private String parentId;
+	private String name;
+	private String fullName;
+	private String officeCode;
+	private Integer sorts;
+	private SysOfficeTypeEnum sysOfficeTypeEnum;
+	private String leader;
+	private String tel;
+	private String address;
+	private String zipCode;
+	private String email;
+	private String remarks;
+	private SysOfficeStatusEnum sysOfficeStatusEnum;
+	
+	public String getParentId() {
+		return parentId;
+	}
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getFullName() {
+		return fullName;
+	}
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+	public String getOfficeCode() {
+		return officeCode;
+	}
+	public void setOfficeCode(String officeCode) {
+		this.officeCode = officeCode;
+	}
+	public Integer getSorts() {
+		return sorts;
+	}
+	public void setSorts(Integer sorts) {
+		this.sorts = sorts;
+	}
+	public SysOfficeTypeEnum getSysOfficeTypeEnum() {
+		return sysOfficeTypeEnum;
+	}
+	public void setSysOfficeTypeEnum(SysOfficeTypeEnum sysOfficeTypeEnum) {
+		this.sysOfficeTypeEnum = sysOfficeTypeEnum;
+	}
+	public String getLeader() {
+		return leader;
+	}
+	public void setLeader(String leader) {
+		this.leader = leader;
+	}
+	public String getTel() {
+		return tel;
+	}
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+	public String getAddress() {
+		return address;
+	}
+	public void setAddress(String address) {
+		this.address = address;
+	}
+	public String getZipCode() {
+		return zipCode;
+	}
+	public void setZipCode(String zipCode) {
+		this.zipCode = zipCode;
+	}
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public SysOfficeStatusEnum getSysOfficeStatusEnum() {
+		return sysOfficeStatusEnum;
+	}
+	public void setSysOfficeStatusEnum(SysOfficeStatusEnum sysOfficeStatusEnum) {
+		this.sysOfficeStatusEnum = sysOfficeStatusEnum;
+	}
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	} 
+	
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysOfficeCondition.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysOfficeCondition.java
new file mode 100644
index 0000000..30b4c03
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysOfficeCondition.java
@@ -0,0 +1,14 @@
+package com.tamguo.modules.sys.model.condition;
+
+public class SysOfficeCondition {
+
+	private String parentCode;
+
+	public String getParentCode() {
+		return parentCode;
+	}
+
+	public void setParentCode(String parentCode) {
+		this.parentCode = parentCode;
+	}
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysCompanyStatusEnum.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysCompanyStatusEnum.java
new file mode 100644
index 0000000..a12d577
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysCompanyStatusEnum.java
@@ -0,0 +1,34 @@
+package com.tamguo.modules.sys.model.enums;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.enums.IEnum;
+
+/**
+ * 用户状态
+ */
+public enum SysCompanyStatusEnum implements IEnum {
+	NORMAL("normal", "正常"),
+	DELETE("delete", "删除"),
+	DISABLED("disabled" , "停用");
+
+    private String value;
+    private String desc;
+
+    SysCompanyStatusEnum(final String value, final String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Serializable getValue() {
+        return this.value;
+    }
+
+    public String getDesc(){
+        return this.desc;
+    }
+    
+    @Override
+    public String toString() {
+    	return this.value;
+    }
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysOfficeStatusEnum.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysOfficeStatusEnum.java
new file mode 100644
index 0000000..806cb1c
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysOfficeStatusEnum.java
@@ -0,0 +1,34 @@
+package com.tamguo.modules.sys.model.enums;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.enums.IEnum;
+
+/**
+ * 用户状态
+ */
+public enum SysOfficeStatusEnum implements IEnum {
+	NORMAL("normal", "正常"),
+	DELETE("delete", "删除"),
+	DISABLED("disabled" , "停用");
+
+    private String value;
+    private String desc;
+
+    SysOfficeStatusEnum(final String value, final String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Serializable getValue() {
+        return this.value;
+    }
+
+    public String getDesc(){
+        return this.desc;
+    }
+    
+    @Override
+    public String toString() {
+    	return this.value;
+    }
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysOfficeTypeEnum.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysOfficeTypeEnum.java
new file mode 100644
index 0000000..ede3be8
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/enums/SysOfficeTypeEnum.java
@@ -0,0 +1,34 @@
+package com.tamguo.modules.sys.model.enums;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.enums.IEnum;
+
+/**
+ * 用户状态
+ */
+public enum SysOfficeTypeEnum implements IEnum {
+	PROVINCE("province", "省级公司"),
+	CITY("city", "市级公司"),
+	DEPARTMENT("department" , "部门");
+
+    private String value;
+    private String desc;
+
+    SysOfficeTypeEnum(final String value, final String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Serializable getValue() {
+        return this.value;
+    }
+
+    public String getDesc(){
+        return this.desc;
+    }
+    
+    @Override
+    public String toString() {
+    	return this.value;
+    }
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysOfficeService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysOfficeService.java
new file mode 100644
index 0000000..e8df817
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysOfficeService.java
@@ -0,0 +1,12 @@
+package com.tamguo.modules.sys.service;
+
+import java.util.List;
+
+import com.tamguo.modules.sys.model.SysOfficeEntity;
+import com.tamguo.modules.sys.model.condition.SysOfficeCondition;
+
+public interface ISysOfficeService {
+
+	List<SysOfficeEntity> listData(SysOfficeCondition condition);
+
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysOfficeServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysOfficeServiceImpl.java
new file mode 100644
index 0000000..a09d0a3
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysOfficeServiceImpl.java
@@ -0,0 +1,24 @@
+package com.tamguo.modules.sys.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.tamguo.modules.sys.dao.SysOfficeMapper;
+import com.tamguo.modules.sys.model.SysOfficeEntity;
+import com.tamguo.modules.sys.model.condition.SysOfficeCondition;
+import com.tamguo.modules.sys.service.ISysOfficeService;
+
+@Service
+public class SysOfficeServiceImpl implements ISysOfficeService {
+	
+	@Autowired
+	private SysOfficeMapper sysOfficeMapper;
+
+	@Override
+	public List<SysOfficeEntity> listData(SysOfficeCondition condition) {
+		return sysOfficeMapper.listData(condition);
+	}
+
+}
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/OfficeController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/OfficeController.java
new file mode 100644
index 0000000..7624978
--- /dev/null
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/OfficeController.java
@@ -0,0 +1,42 @@
+package com.tamguo.modules.sys.web;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.tamguo.modules.sys.model.SysOfficeEntity;
+import com.tamguo.modules.sys.model.condition.SysOfficeCondition;
+import com.tamguo.modules.sys.service.ISysOfficeService;
+
+/**
+ * Controller - 组织
+ * 
+ * @author tamguo
+ *
+ */
+@Controller
+@RequestMapping(path="sys/office")
+public class OfficeController {
+	
+	private final String OFFICE_INDEX_PAGE = "modules/sys/office/index";
+
+	@Autowired
+	private ISysOfficeService iSysOfficeService; 
+	
+	@RequestMapping(path="index")
+	public String index(ModelAndView model) {
+		return OFFICE_INDEX_PAGE;
+	}
+	
+	@RequestMapping(path="listData")
+	@ResponseBody
+	public List<SysOfficeEntity> listData(SysOfficeCondition condition) {
+		return iSysOfficeService.listData(condition);
+	}
+
+	
+}
diff --git a/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml b/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml
index 92a819d..09b6346 100644
--- a/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml
+++ b/tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml
@@ -5,6 +5,7 @@
 	<select id="listData" resultType="SysCompanyEntity">
 		SELECT
 			c.id,
+			c.code,
 			c.parent_id,
 			c.is_leaf,
 			c.tree_level,
@@ -17,7 +18,8 @@
 			c.zip_code,
 			c.email,
 			c.remarks,
-			c.update_date
+			c.update_date,
+			c.status
 		FROM
 			sys_company c		
 		<where>
diff --git a/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml b/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml
new file mode 100644
index 0000000..78febbe
--- /dev/null
+++ b/tamguo-oms/src/main/resources/mappers/SysOfficeMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tamguo.modules.sys.dao.SysOfficeMapper">
+	
+	<select id="listData" resultType="SysCompanyEntity">
+		SELECT
+			o.id,
+			o.parent_id,
+			o.name,
+			o.full_name,
+			o.office_code,
+			o.sorts,
+			o.office_type,
+			o.leader,
+			o.tel,
+			o.address,
+			o.zip_code,
+			o.email,
+			o.remarks,
+			o.`status`,
+			o.is_leaf,
+			o.tree_level
+		FROM
+			sys_office o	
+		<where>
+			1 = 1
+			<choose>
+		        <when test="parentCode != null and parentCode != ''">
+		          	and o.parent_id = #{parentCode}
+		        </when>
+		        <otherwise>
+		            and o.tree_level = 0
+		        </otherwise>
+		    </choose>
+		</where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/templates/include/leftMenu.html b/tamguo-oms/src/main/resources/templates/include/leftMenu.html
index 586f482..eb967c0 100644
--- a/tamguo-oms/src/main/resources/templates/include/leftMenu.html
+++ b/tamguo-oms/src/main/resources/templates/include/leftMenu.html
@@ -20,7 +20,8 @@
 		     	  <a title="组织管理" href="javascript:" data-href="blank" class="addTabPage"><i class="fa fa-fw icon-grid"></i> <span>组织管理</span> <span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a> 
 			      <ul class="treeview-menu"> 
 				       <li class="treeview"><a title="用户管理" href="javascript:" data-href="sys/user/index" class="addTabPage"><i class="fa fa-fw icon-user"></i> <span>用户管理</span></a></li> 
-				       <li class="treeview"><a title="机构管理" href="javascript:" data-href="sys/company/index" class="addTabPage"><i class="fa fa-fw icon-grid"></i> <span>机构管理</span></a></li> 
+				       <li class="treeview"><a title="机构管理" href="javascript:" data-href="sys/office/index" class="addTabPage"><i class="fa fa-fw icon-grid"></i> <span>机构管理</span></a></li>
+				       <li class="treeview"><a title="公司管理" href="javascript:" data-href="sys/company/index" class="addTabPage"><i class="fa fa-fw icon-fire"></i> <span>公司管理</span></a></li> 
 				       <li class="treeview"><a title="岗位管理" href="javascript:" data-href="/js/a/sys/post/list" class="addTabPage"><i class="fa fa-fw icon-trophy"></i> <span>岗位管理</span></a></li> 
 			      </ul>
 		     </li> 
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/common/treeselect.html b/tamguo-oms/src/main/resources/templates/modules/sys/common/treeselect.html
index 37dee59..5b4f0c1 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/common/treeselect.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/common/treeselect.html
@@ -46,7 +46,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 var setting = {
 	view:{selectedMulti:false,dblClickExpand:false},
 	check:{enable:"false"=="true",nocheckInherit:true},
-	data:{simpleData: {enable: true,idKey: "uid",pIdKey: "parentId",rootPId: "",enable:true},key: {url:"nourl"}},callback:{
+	data:{simpleData: {enable: true,idKey: "id",pIdKey: "parentId",rootPId: "",enable:true},key: {url:"nourl"}},callback:{
 		onClick:function(event, treeId, treeNode){
 			tree.expandNode(treeNode);
 		},
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html
index a1118bc..a70f378 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/company/index.html
@@ -1,14 +1,10 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-4.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="utf-8"><meta content="webkit" name="renderer"/>
-<meta http-equiv="X-UA-Compatible"
+<!DOCTYPE html><html><head><meta charset="utf-8"><meta content="webkit" name="renderer"/><meta http-equiv="X-UA-Compatible"
 content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
 content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
 content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
 content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
-<title>机构管理 - JeeSite Demo</title>
-<script th:src="${setting.domain + 'global.min.js?ctx=/js/a'}"></script>
+<title>公司管理 - JeeSite Demo</title>
+<script th:src="${setting.domain + 'global.min.js'}"></script>
 <script th:src="${setting.domain + 'jquery/jquery-1.12.4.min.js'}"></script>
 <script th:src="${setting.domain + 'jquery/jquery-migrate-1.4.1.min.js'}"></script>
 <!--[if lt IE 9]><script src="/js/static/common/h5fix.min.js"></script><![endif]-->
@@ -25,43 +21,36 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 	<div class="box box-main">
 		<div class="box-header">
 			<div class="box-title">
-				<i class="fa icon-grid"></i> 机构管理
+				<i class="fa icon-fire"></i> 公司管理
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
 				<a href="#" class="btn btn-default" id="btnRefreshTree" title="刷新"><i class="fa fa-refresh"></i> 刷新</a>
 				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="展开一级"><i class="fa fa-angle-double-down"></i> 展开</a>
 				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="折叠全部"><i class="fa fa-angle-double-up"></i> 折叠</a>
-					<a href="/js/a/sys/office/form" class="btn btn-default btnTool" title="新增机构"><i class="fa fa-plus"></i> 新增</a>
+					<a href="/js/a/sys/company/form" class="btn btn-default btnTool" title="新增公司"><i class="fa fa-plus"></i> 新增</a>
 			</div>
 		</div>
 		<div class="box-body">
 <form id="searchForm" th:action="${setting.domain + 'sys/company/listData'}" method="post" class="form-inline hide" data-page-no="" data-page-size="" data-order-by="">
 				<div class="form-group">
-					<label class="control-label">机构代码：</label>
+					<label class="control-label">公司代码：</label>
 					<div class="control-inline">
 <input type="text" id="viewCode" name="viewCode" value="" maxlength="100" class="form-control width-120"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">机构名称：</label>
+					<label class="control-label">公司名称：</label>
 					<div class="control-inline">
-<input type="text" id="officeName" name="officeName" value="" maxlength="100" class="form-control width-120"/>
+<input type="text" id="companyName" name="companyName" value="" maxlength="200" class="form-control width-120"/>
 					</div>
 				</div>
 				<div class="form-group">
-					<label class="control-label">机构全称：</label>
+					<label class="control-label">公司全称：</label>
 					<div class="control-inline">
 <input type="text" id="fullName" name="fullName" value="" maxlength="200" class="form-control width-120"/>
 					</div>
 				</div>
-				<div class="form-group">
-					<label class="control-label">机构类型：</label>
-					<div class="control-inline width-90">
-
-<select id="officeType" name="officeType" class="form-control">
-<option value="">&nbsp;</option><option value="1">省级公司</option><option value="2">市级公司</option><option value="3">部门</option></select>					</div>
-				</div>
 				<div class="form-group">
 					<label class="control-label">状态：</label>
 					<div class="control-inline width-60">
@@ -97,32 +86,34 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'机构名称', name:'name', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '( '+row.id+' ) '+'<a href="/js/a/sys/office/form?officeCode='+row.id+'" class="btnList" data-title="编辑机构">'+(val||row.id)+'</a>';
+		{header:'公司名称', name:'name', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '( '+row.code+' ) '+'<a href="/js/a/sys/company/form?companyCode='+row.uid+'" class="btnList" data-title="编辑公司">'+(val||row.code)+'</a>';
 		}},
-		{header:'机构全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
-		{header:'机构类型', name:'type', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){
-			return "股份公司";
-		}},
-		{header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'公司全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
+		{header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
+		{header:'归属区域', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"},
+		{header:'更新时间', name:'updateDate', index:'a.update_date', width:200, align:"center"},
 		{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
-		{header:'操作', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){
+		{header:'状态', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
+			return js.getDictLabel([{"id":"1019065439174938624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":20,"treeSorts":"0000000020,","treeNames":"正常","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439174938624","dictLabelOrig":"正常","dictType":"sys_status","cssStyle":"","description":"","dictValue":"0","dictLabel":"正常","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439330127872","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":30,"treeSorts":"0000000030,","treeNames":"删除","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439330127872","dictLabelOrig":"删除","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"1","dictLabel":"删除","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439481122816","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":40,"treeSorts":"0000000040,","treeNames":"停用","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439481122816","dictLabelOrig":"停用","dictType":"sys_status","cssStyle":"color:#f00;","description":"","dictValue":"2","dictLabel":"停用","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439699226624","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":50,"treeSorts":"0000000050,","treeNames":"冻结","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439699226624","dictLabelOrig":"冻结","dictType":"sys_status","cssStyle":"color:#fa0;","description":"","dictValue":"3","dictLabel":"冻结","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065439875387392","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":60,"treeSorts":"0000000060,","treeNames":"待审","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065439875387392","dictLabelOrig":"待审","dictType":"sys_status","cssStyle":"","description":"","dictValue":"4","dictLabel":"待审","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440022188032","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":70,"treeSorts":"0000000070,","treeNames":"驳回","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440022188032","dictLabelOrig":"驳回","dictType":"sys_status","cssStyle":"","description":"","dictValue":"5","dictLabel":"驳回","parentCode":"0","isRoot":true,"isTreeLeaf":true},{"id":"1019065440210931712","status":"0","createBy":"system","createDate":"2018-07-17 11:45","updateDate":"2018-07-17 11:45","updateBy":"system","treeLevel":0,"parentCodes":"0,","treeSort":80,"treeSorts":"0000000080,","treeNames":"草稿","treeLeaf":"1","isSys":"1","cssClass":"","dictCode":"1019065440210931712","dictLabelOrig":"草稿","dictType":"sys_status","cssStyle":"color:#aaa;","description":"","dictValue":"9","dictLabel":"草稿","parentCode":"0","isRoot":true,"isTreeLeaf":true}], val, '未知', true);
+		}},
+		{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
 			var actions = [];
-				actions.push('<a href="/js/a/sys/office/form?officeCode='+row.officeCode+'" class="btnList" title="编辑机构"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="/js/a/sys/company/form?companyCode='+row.companyCode+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="/js/a/sys/office/disable?officeCode='+row.officeCode+'" class="btnList" title="停用机构" data-confirm="确认要停用该机构吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				}
 				if (row.status == Global.STATUS_DISABLE){
 					actions.push('<a href="/js/a/sys/office/enable?officeCode='+row.officeCode+'" class="btnList" title="启用机构" data-confirm="确认要启用该机构吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
 				}
-				actions.push('<a href="/js/a/sys/office/delete?officeCode='+row.officeCode+'" class="btnList" title="删除机构" data-confirm="确认要删除该机构及所有子机构吗？" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
-				actions.push('<a href="/js/a/sys/office/form?parentCode='+row.id+'" class="btnList" title="新增下级机构"><i class="fa fa-plus-square"></i></a>&nbsp;');
+				actions.push('<a href="/js/a/sys/company/delete?companyCode='+row.companyCode+'" class="btnList" title="删除公司" data-confirm="确认要删除该公司及所有子公司吗？" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="/js/a/sys/company/form?parentCode='+row.id+'" class="btnList" title="新增下级公司"><i class="fa fa-plus-square"></i></a>&nbsp;');
 			return actions.join('');
 		}}
 	],
 	treeGrid: true,			// 启用树结构表格
 	defaultExpandLevel: 0,	// 默认展开的层次
-	expandNodeClearPostData: 'viewCode,officeName,fullName,officeType,', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据）	// 加载成功后执行事件
+	expandNodeClearPostData: 'viewCode,companyName,fullName,', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据）	// 加载成功后执行事件
 	ajaxSuccess: function(data){
 		
 	}
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/office/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/office/index.html
new file mode 100644
index 0000000..5d9a24a
--- /dev/null
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/office/index.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-4.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="utf-8"><meta content="webkit" name="renderer"/>
+<meta http-equiv="X-UA-Compatible"
+content="IE=edge"><meta name="keywords" content="PoweredByJeeSiteV4.0"/><meta http-equiv="Cache-Control"
+content="no-cache, no-store, must-revalidate"/><meta name="description" content="PoweredByJeeSiteV4.0"/><meta
+content="no-cache" http-equiv="Pragma"/><meta http-equiv="Expires" content="0"/><meta
+content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
+<title>机构管理 - JeeSite Demo</title>
+<script th:src="${setting.domain + 'global.min.js?ctx=/js/a'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-1.12.4.min.js'}"></script>
+<script th:src="${setting.domain + 'jquery/jquery-migrate-1.4.1.min.js'}"></script>
+<!--[if lt IE 9]><script src="/js/static/common/h5fix.min.js"></script><![endif]-->
+<link rel="stylesheet" th:href="${setting.domain + 'fonts/font-icons.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'bootstrap/css/bootstrap.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'select2/4.0/select2.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'icheck/1.0/minimal/grey.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'jqGrid/4.7/css/ui.jqgrid.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'adminlte/css/AdminLTE.min.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/jeesite.css'}">
+<link rel="stylesheet" th:href="${setting.domain + 'common/common.css'}">
+</head><body class="hold-transition ">
+<div class="wrapper"><div class="main-content">
+	<div class="box box-main">
+		<div class="box-header">
+			<div class="box-title">
+				<i class="fa icon-grid"></i> 机构管理
+			</div>
+			<div class="box-tools pull-right">
+				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
+				<a href="#" class="btn btn-default" id="btnRefreshTree" title="刷新"><i class="fa fa-refresh"></i> 刷新</a>
+				<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="展开一级"><i class="fa fa-angle-double-down"></i> 展开</a>
+				<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="折叠全部"><i class="fa fa-angle-double-up"></i> 折叠</a>
+					<a href="/js/a/sys/office/form" class="btn btn-default btnTool" title="新增机构"><i class="fa fa-plus"></i> 新增</a>
+			</div>
+		</div>
+		<div class="box-body">
+<form id="searchForm" th:action="${setting.domain + 'sys/office/listData'}" method="post" class="form-inline hide" data-page-no="" data-page-size="" data-order-by="">
+				<div class="form-group">
+					<label class="control-label">机构代码：</label>
+					<div class="control-inline">
+<input type="text" id="viewCode" name="viewCode" value="" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">机构名称：</label>
+					<div class="control-inline">
+<input type="text" id="officeName" name="officeName" value="" maxlength="100" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">机构全称：</label>
+					<div class="control-inline">
+<input type="text" id="fullName" name="fullName" value="" maxlength="200" class="form-control width-120"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">机构类型：</label>
+					<div class="control-inline width-90">
+
+<select id="officeType" name="officeType" class="form-control">
+<option value="">&nbsp;</option><option value="1">省级公司</option><option value="2">市级公司</option><option value="3">部门</option></select>					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">状态：</label>
+					<div class="control-inline width-60">
+
+<select id="status" name="status" class="form-control">
+<option value="">&nbsp;</option><option value="0">正常</option><option value="2">停用</option></select>					</div>
+				</div>
+				<div class="form-group">
+					<button type="submit" class="btn btn-primary btn-sm">查询</button>
+					<button type="reset" class="btn btn-default btn-sm">重置</button>
+				</div>
+</form>
+			<table id="dataGrid"></table>
+		</div>
+	</div>
+</div>
+</div>
+
+<a id="scroll-up" href="#" class="btn btn-sm"><i class="fa fa-angle-double-up"></i></a>
+<script th:src="${setting.domain + 'bootstrap/js/bootstrap.min.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/select2.js'}"></script>
+<script th:src="${setting.domain + 'select2/4.0/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'layer/3.1/layer.js'}"></script>
+<script th:src="${setting.domain + 'my97/WdatePicker.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/jquery.jqGrid.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/jquery.jqGrid.extend.js'}"></script>
+<script th:src="${setting.domain + 'jqGrid/4.7/js/i18n/zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'common/jeesite.js'}"></script>
+<script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'common/common.js'}"></script>
+<script>
+// 初始化DataGrid对象
+$('#dataGrid').dataGrid({
+	searchForm: $("#searchForm"),
+	columnModel: [
+		{header:'机构名称', name:'name', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
+			return '( '+row.id+' ) '+'<a href="/js/a/sys/office/form?officeCode='+row.id+'" class="btnList" data-title="编辑机构">'+(val||row.id)+'</a>';
+		}},
+		{header:'机构全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
+		{header:'机构类型', name:'type', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){
+			return "股份公司";
+		}},
+		{header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"},
+		{header:'备注信息', name:'remarks', index:'a.remarks', width:200, align:"left"},
+		{header:'操作', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){
+			var actions = [];
+				actions.push('<a href="/js/a/sys/office/form?officeCode='+row.officeCode+'" class="btnList" title="编辑机构"><i class="fa fa-pencil"></i></a>&nbsp;');
+				if (row.status == Global.STATUS_NORMAL){
+					actions.push('<a href="/js/a/sys/office/disable?officeCode='+row.officeCode+'" class="btnList" title="停用机构" data-confirm="确认要停用该机构吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
+				}
+				if (row.status == Global.STATUS_DISABLE){
+					actions.push('<a href="/js/a/sys/office/enable?officeCode='+row.officeCode+'" class="btnList" title="启用机构" data-confirm="确认要启用该机构吗？"><i class="glyphicon glyphicon-ok-circle"></i></a>&nbsp;');
+				}
+				actions.push('<a href="/js/a/sys/office/delete?officeCode='+row.officeCode+'" class="btnList" title="删除机构" data-confirm="确认要删除该机构及所有子机构吗？" data-deltreenode="'+row.id+'"><i class="fa fa-trash-o"></i></a>&nbsp;');
+				actions.push('<a href="/js/a/sys/office/form?parentCode='+row.id+'" class="btnList" title="新增下级机构"><i class="fa fa-plus-square"></i></a>&nbsp;');
+			return actions.join('');
+		}}
+	],
+	treeGrid: true,			// 启用树结构表格
+	defaultExpandLevel: 0,	// 默认展开的层次
+	expandNodeClearPostData: 'viewCode,officeName,fullName,officeType,', // 展开节点清理请求参数数据（一般设置查询条件的字段属性，否则在查询后，不能展开子节点数据）	// 加载成功后执行事件
+	ajaxSuccess: function(data){
+		
+	}
+});
+</script>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
index 8f0583d..da2c04f 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/list.html
@@ -121,7 +121,7 @@ $("#companyButton,#companyName").click(function(){
 					js.showMessage("不能选择根节点（"+nodes[i].name+"）请重新选择。");
 					return false;
 				}
-				var code = nodes[i]['uid'], name = nodes[i]['name'];
+				var code = nodes[i]['id'], name = nodes[i]['name'];
 				codes.push(code.replace(/^u_/g,''));
 				names.push(name.replace(/\([0-9]*\)/g,''));
 				break;