From c662a94ad1026d7a8f5733e69a28ac31651eb319 Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Wed, 1 Aug 2018 14:27:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/modules/sys/role/index.html    | 6 +++---
 .../src/main/resources/templates/modules/sys/role/menu.html | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 d2859ed..a85b3cb 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
@@ -127,9 +127,9 @@ $('#dataGrid').dataGrid({
 				actions.push('<a href="/js/a/sys/role/delete?roleCode='+row.roleCode+'" class="btnList" title="删除角色" data-confirm="确认要删除该角色吗？"><i class="fa fa-trash-o"></i></a>&nbsp;');
 				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="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/user?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/menu?roleCode='+row.roleCode+'&op=auth" class="btn btn-default btn-xs btnList" title="角色分配功能权限"><i class="fa fa-check-square-o"></i> 功能菜单</a>&nbsp;');
+				actions.push('<a href="sys/role/dataScope?roleCode='+row.roleCode+'" class="btn btn-default btn-xs btnList" title="角色分配数据权限"><i class="fa fa-check-circle-o"></i> 数据权限</a>&nbsp;');
+				actions.push('<a href="sys/role/user?roleCode='+row.roleCode+'" class="btn btn-default btn-xs btnList" title="角色分配用户"><i class="fa fa-user"></i> 分配用户</a>&nbsp;');
 				actions.push('</div>');			
 			return actions.join('');
 		}}
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/role/menu.html b/tamguo-oms/src/main/resources/templates/modules/sys/role/menu.html
index 69281d0..8e1318c 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/role/menu.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/role/menu.html
@@ -104,7 +104,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 <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>
+<script type="text/javascript" th:inline="javascript">
 $("#inputForm").validate({
 	submitHandler: function(form){
 		// 获取数据权限数据
@@ -158,7 +158,7 @@ menuTrees = {}; // 用sysCode分类存储所有菜单树
 $.ajax({
 	type: 'POST',
 	url: "menuTreeData?___t=" + new Date().getTime(),
-	data: {roleCode: 'dept'},
+	data: {roleCode: [[${role.roleCode}]]},
 	dataType: 'json',
 	async: false,
 	error: function(data){