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
index e8df817..2314137 100644
--- 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
@@ -2,6 +2,7 @@ package com.tamguo.modules.sys.service;
 
 import java.util.List;
 
+import com.alibaba.fastjson.JSONArray;
 import com.tamguo.modules.sys.model.SysOfficeEntity;
 import com.tamguo.modules.sys.model.condition.SysOfficeCondition;
 
@@ -9,4 +10,6 @@ public interface ISysOfficeService {
 
 	List<SysOfficeEntity> listData(SysOfficeCondition condition);
 
+	JSONArray treeData(String excludeId);
+
 }
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
index a09d0a3..98ba8cf 100644
--- 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
@@ -1,10 +1,13 @@
 package com.tamguo.modules.sys.service.impl;
 
 import java.util.List;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.Condition;
 import com.tamguo.modules.sys.dao.SysOfficeMapper;
 import com.tamguo.modules.sys.model.SysOfficeEntity;
 import com.tamguo.modules.sys.model.condition.SysOfficeCondition;
@@ -21,4 +24,34 @@ public class SysOfficeServiceImpl implements ISysOfficeService {
 		return sysOfficeMapper.listData(condition);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public JSONArray treeData(String excludeId) {
+		List<SysOfficeEntity> officeList = null;
+		if(StringUtils.isEmpty(excludeId)) {
+			officeList = sysOfficeMapper.selectList(Condition.EMPTY);
+		}else {
+			officeList = sysOfficeMapper.selectList(Condition.create().notLike("parent_codes", excludeId).ne("office_code", excludeId));
+		}
+		return turnZTreeData(officeList);
+	}
+	
+	private JSONArray turnZTreeData(List<SysOfficeEntity> companyList) {
+		if(companyList != null) {
+			JSONArray nodes = new JSONArray();
+			for(int i=0 ; i<companyList.size() ; i++) {
+				JSONObject node = new JSONObject();
+				
+				SysOfficeEntity office = companyList.get(i);
+				node.put("name", office.getOfficeName());
+				node.put("id", office.getId());
+				node.put("pId", office.getParentCode());
+				node.put("title", office.getFullName());
+				nodes.add(node);
+			}
+			return nodes;
+		}
+		return null;
+	}
+
 }
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/SysOfficeController.java
similarity index 79%
rename from tamguo-oms/src/main/java/com/tamguo/modules/sys/web/OfficeController.java
rename to tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysOfficeController.java
index 7624978..11942f8 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/OfficeController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysOfficeController.java
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.alibaba.fastjson.JSONArray;
 import com.tamguo.modules.sys.model.SysOfficeEntity;
 import com.tamguo.modules.sys.model.condition.SysOfficeCondition;
 import com.tamguo.modules.sys.service.ISysOfficeService;
@@ -20,7 +21,7 @@ import com.tamguo.modules.sys.service.ISysOfficeService;
  */
 @Controller
 @RequestMapping(path="sys/office")
-public class OfficeController {
+public class SysOfficeController {
 	
 	private final String OFFICE_INDEX_PAGE = "modules/sys/office/index";
 
@@ -37,6 +38,12 @@ public class OfficeController {
 	public List<SysOfficeEntity> listData(SysOfficeCondition condition) {
 		return iSysOfficeService.listData(condition);
 	}
+	
+	@RequestMapping(path="treeData")
+	@ResponseBody
+	public JSONArray treeData(String excludeId) {
+		return iSysOfficeService.treeData(excludeId);
+	}
 
 	
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java
index 1246e97..cd31edf 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java
@@ -23,6 +23,8 @@ public class SysRoleController {
 	private final String ROLE_INDEX_PAGE = "modules/sys/role/index";
 	// 分配角色菜单权限
 	private final String ROLE_MENU_INDEX_PAGE = "modules/sys/role/menu";
+	// 数据权限
+	private final String ROLE_DATA_INDEX_PAGE = "modules/sys/role/dataScope";
 	
 	@Autowired
 	private ISysRoleService iSysRoleService;
@@ -41,6 +43,14 @@ public class SysRoleController {
 		return model;
 	}
 	
+	/** 数据权限 */
+	@RequestMapping(path="dataScope")
+	public ModelAndView dataScope(String roleCode , ModelAndView model) {
+		model.addObject("role", iSysRoleService.selectById(roleCode));
+		model.setViewName(ROLE_DATA_INDEX_PAGE);
+		return model;
+	}
+	
 	/** 列表数据*/
 	@RequestMapping(path="listData",method=RequestMethod.POST)
 	@ResponseBody
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/role/dataScope.html b/tamguo-oms/src/main/resources/templates/modules/sys/role/dataScope.html
new file mode 100644
index 0000000..1cb1c0a
--- /dev/null
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/role/dataScope.html
@@ -0,0 +1,265 @@
+<!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'}"></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 + 'jquery-ztree/3.5/css/metro/zTreeStyle.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-people"></i> 角色授权数据权限
+			</div>
+			<div class="box-tools pull-right">
+				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			</div>
+		</div>
+<form id="inputForm" action="sys/role/saveDataScope" method="post" class="form-horizontal">
+			<div class="box-body"><br/>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 角色名称：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+<input type="hidden" id="oldRoleName" name="oldRoleName" value="部门经理"/>
+<input type="text" id="roleName" name="roleName" th:value="${role.roleName}" maxlength="100" readonly="true" class="form-control required "/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required ">*</span> 角色编码：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-8">
+<input type="hidden" id="isNewRecord" name="isNewRecord" value="false"/>
+<input type="text" id="roleCode" name="roleCode" th:value="${role.roleCode}" maxlength="64" readonly="true" class="form-control required abc"/>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-12">
+						<div class="form-group">
+							<label class="control-label col-sm-2" title="">
+								<span class="required ">*</span> 数据范围：<i class="fa icon-question hide"></i></label>
+							<div class="col-sm-10">
+
+								<span id="dataScope" class="icheck">
+								<label>
+									<input type="radio" id="dataScope1" name="dataScope" value="0" class="form-control required "> 未设置</label><label>
+									<input type="radio" id="dataScope2" name="dataScope" value="1" class="form-control required "> 全部数据权限</label><label>
+									<input type="radio" id="dataScope3" name="dataScope" value="2" class="form-control required " checked> 自定数据权限</label></span>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="form-unit">授权数据权限</div>
+				<div id="dataScopeTrees"></div>
+				<script id="dataScopeTpl" type="text/template">
+					<div class="pull-left" style="padding:0 15px;min-width:300px;">
+						<div class="box box-solid" style="background:#FAFAFA">
+							<div class="box-header">
+								<div class="box-title icheck">
+									<label><input type="checkbox" id="checkall_{{d.key}}"
+										class="checkall"/> {{d.label}}</label>
+								</div>
+								<div class="box-tools pull-right" style="top:8px;">
+									<a class="btn btn-box-tool" id="expand_{{d.key}}"
+										value="dataScopeTree_{{d.key}}" >展开</a>/<a
+										class="btn btn-box-tool" id="collapse_{{d.key}}"
+										value="dataScopeTree_{{d.key}}" >折叠</a>
+								</div>
+							</div>
+							<div class="box-body">
+								<div id="dataScopeTree_{{d.key}}" class="ztree"></div>
+							</div>
+						</div>
+					</div>
+				</script>
+<input type="hidden" id="roleDataScopeListJson" name="roleDataScopeListJson" value=""/>
+			</div>
+			<div class="box-footer">
+				<div class="row">
+					<div class="col-sm-offset-2 col-sm-10">
+							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 保 存</button>&nbsp;
+						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 关 闭</button>
+					</div>
+				</div>
+			</div>
+</form>
+	</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 + 'jquery-ztree/3.5/js/jquery.ztree.all-3.5.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/localization/messages_zh_CN.js'}"></script>
+<script th:src="${setting.domain + 'jquery-validation/1.16/jquery.validate.extend.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>
+$("#inputForm").validate({
+	submitHandler: function(form){
+		// 获取数据权限数据
+		var dataScopeData = [];
+		$.each(dataScopeTrees, function(key, dataScopeTree){
+			var treeNodes = dataScopeTree.getCheckedNodes(true);
+			for(var i=0; i<treeNodes.length; i++) {
+				dataScopeData.push({
+					ctrlType: key, ctrlData: treeNodes[i].id
+				});
+			}
+		});
+		$("#roleDataScopeListJson").val(JSON.stringify(dataScopeData));
+		// 提交表单数据
+		js.ajaxSubmitForm($(form), function(data){
+			js.showMessage(data.message);
+			if(data.result == Global.TRUE){
+				js.closeCurrentTabPage(function(contentWindow){
+					contentWindow.page();
+				});
+			}
+		}, "json");
+    }
+});
+//加载数据权限树结构
+var setting = {
+	check:{enable:true,nocheckInherit:true},
+	view:{selectedMulti:false,nameIsHTML: true},
+	data:{simpleData:{enable:true},key:{title:"title"}},
+	callback:{
+		beforeClick: function (treeId, treeNode, clickFlag) {
+			var tree = $.fn.zTree.getZTreeObj(treeId);
+			tree.checkNode(treeNode, !treeNode.checked, true, true);
+			return false;
+		},
+		onCheck: function (event, treeId, treeNode){
+			var tid = treeNode.tId;
+			if(!treeNode.checked){
+				$(".checkall[value="+treeId+"]").each(function(){
+					if(this.checked){
+					    $(this).removeAttr("checked").iCheck('update');
+					}
+					return false;
+				}); 
+			}
+			// 选中 自定义权限 单选按钮
+			$('#dataScope3').parent().click();
+		}
+	}
+},
+moduleCodes = '["core","devtools"]';
+dataScopes = [{
+  moduleCode: "core",
+  ctrlPermi: "0",
+  ctrlName: "机构权限",
+  ctrlName_en: "Office",
+  ctrlType: "Office",
+  ctrlDataUrl: "/sys/office/treeData",
+  chkboxType: {"Y":"ps","N":"ps"},
+  expandLevel: -1,
+  remarks: ""
+},{
+  moduleCode: "core",
+  ctrlName: "公司权限",
+  ctrlName_en: "Company",
+  ctrlType: "Company",
+  ctrlPermi: "0",
+  ctrlDataUrl: "/sys/company/treeData",
+  chkboxType: {"Y":"ps","N":"ps"},
+  expandLevel: -1,
+  remarks: ""
+},{
+  moduleCode: "core",
+  ctrlName: "角色权限",
+  ctrlName_en: "Role",
+  ctrlType: "Role",
+  ctrlPermi: "2",
+  ctrlDataUrl: "/sys/role/treeData",
+  chkboxType: {"Y":"ps","N":"ps"},
+  expandLevel: -1,
+  remarks: ""
+}]
+,
+dataScopeTrees = {}; // 用sysCode分类存储所有菜单树
+for (var i=0; i<dataScopes.length; i++){
+	var dataScope = dataScopes[i];
+	// 验证模块是否开启，如果未开启，则跳过
+	if (moduleCodes.indexOf("\""+dataScope.moduleCode+"\"") == -1){
+		continue;
+	}
+	// 控制权限 ctrlPermi: 0全部  1拥有权限  2管理权限
+	if (!(dataScope.ctrlPermi == '0'
+			|| dataScope.ctrlPermi == '1')){
+		continue;
+	}
+ 	$('#dataScopeTrees').append(js.template('dataScopeTpl', {
+ 		key: dataScope.ctrlType, label: dataScope.ctrlName_zh_CN || dataScope.ctrlName}));
+ 	var ctrlDataUrl = dataScope.ctrlDataUrl || '';
+	$.ajax({
+		type: 'POST',
+		url: ctrlDataUrl + (ctrlDataUrl.indexOf("?")!=-1?'&':'?') + "___t=" + new Date().getTime(),
+		data: {ctrlPermi: '2'},
+		dataType: 'json',
+		async: false,
+		error: function(data){
+			js.showErrorMessage(data.responseText);
+		},
+		success: function(data, status, xhr){
+			// 初始化树结构
+			var tree = $.fn.zTree.init($("#dataScopeTree_"+dataScope.ctrlType), setting, data);
+			tree.setting.check.chkboxType = dataScope.chkboxType;
+			// 默认展开节点（如果级别设置为-1，则：如果有1个根节点，则展开一级节点，否则不展开）
+			$.fn.zTree.expandNodeByLevel(tree, dataScope.expandLevel);
+			// 树结构：全选、取消全选
+			$('#checkall_'+dataScope.ctrlType).iCheck({
+		 		checkboxClass:'icheckbox_minimal-grey'
+		 	}).on('ifChecked ifUnchecked', function(){
+	        	var ctrlType = $(this).attr('ctrlType');
+				if(this.checked){
+					dataScopeTrees[ctrlType].checkAllNodes(true);
+				}else{
+					dataScopeTrees[ctrlType].checkAllNodes(false);
+				}
+			}).attr("ctrlType", dataScope.ctrlType);
+			// 展开和折叠按钮绑定
+			$('#expand_'+dataScope.ctrlType).click(function(){
+				var ctrlType = $(this).attr('ctrlType');
+				dataScopeTrees[ctrlType].expandAll(true);
+			}).attr("ctrlType", dataScope.ctrlType);
+			$('#collapse_'+dataScope.ctrlType).click(function(){
+				var ctrlType = $(this).attr('ctrlType');
+				dataScopeTrees[ctrlType].expandAll(false);
+			}).attr("ctrlType", dataScope.ctrlType);
+			// 将树对象存储到全局数组里
+			dataScopeTrees[dataScope.ctrlType] = tree;
+		}
+	});
+}
+// 默认选择节点
+try{dataScopeTrees['Company'].checkNode(dataScopeTrees['Company']
+	.getNodeByParam("id","SD1"), true, false);}catch(e){}
+try{dataScopeTrees['Company'].checkNode(dataScopeTrees['Company']
+	.getNodeByParam("id","SD2"), true, false);}catch(e){}
+</script>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/role/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/role/index.html
index e96d5ea..9e3bf37 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/role/index.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/role/index.html
@@ -128,8 +128,8 @@ $('#dataGrid').dataGrid({
 				actions.push('<a href="javascript:" class="btnMore" title="更多操作"><i class="fa fa-chevron-circle-right"></i></a>&nbsp;');
 				actions.push('<div class="moreItems">');
 				actions.push('<a href="sys/role/menu?roleCode='+row.id+'&op=auth" class="btn btn-default btn-xs btnList" title="角色分配功能权限"><i class="fa fa-check-square-o"></i> 功能菜单</a>&nbsp;');
-				actions.push('<a href="/js/a/sys/role/formAuthDataScope?roleCode='+row.id+'" class="btn btn-default btn-xs btnList" title="角色分配数据权限"><i class="fa fa-check-circle-o"></i> 数据权限</a>&nbsp;');
-				actions.push('<a href="/js/a/sys/role/formAuthUser?roleCode='+row.id+'" class="btn btn-default btn-xs btnList" title="角色分配用户"><i class="fa fa-user"></i> 分配用户</a>&nbsp;');
+				actions.push('<a href="sys/role/dataScope?roleCode='+row.id+'" class="btn btn-default btn-xs btnList" title="角色分配数据权限"><i class="fa fa-check-circle-o"></i> 数据权限</a>&nbsp;');
+				actions.push('<a href="sys/role/formAuthUser?roleCode='+row.id+'" class="btn btn-default btn-xs btnList" title="角色分配用户"><i class="fa fa-user"></i> 分配用户</a>&nbsp;');
 				actions.push('</div>');			
 			return actions.join('');
 		}}