From 35ad27a70225879cee6025387e9203fd55a31956 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 8 Aug 2022 21:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=97=A0=E7=94=A8=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/views/modules/sys/user/corpAdminForm.html     | 4 +---
 .../main/resources/views/modules/sys/user/secAdminForm.html | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
index 64dcccae..bb4ccc55 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
@@ -175,9 +175,7 @@ $('#corpCode_').change(function(){
 var roleGrid = $("#roleGrid").dataGrid({
 	url: '${ctx}/sys/role/treeData',
 	postData: [
-//<%// 	{name:'userType',value:'employee'}, // 指定用户类型的角色 %>
-//<%// 	{name:'ctrlPermi',value:'${@Global.getConfig("user.adminCtrlPermi", "2")}'} 		// 过滤可管理的角色 %>
-		{name:'isAll',value:'true'} 	//<%  // 显示所有角色（与上方两个条件互斥） %>
+		{name:'isAll',value:'true'}
 	],
 	columnModel: [
 		{header:'${text("角色名称")}', name:'name', sortable:false, width:100, align:"center"},
diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
index 420cca73..5a7dc4f9 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
@@ -110,8 +110,8 @@ var setting = {
 		onCheck: function (event, treeId, treeNode){ }
 	}
 },
-moduleCodes = '${toJson(moduleCodes)}';
-dataScopes = ${toJson(dataScopes)},
+moduleCodes = '${toJson(@ModuleUtils.getEnableModuleCodes())}',
+dataScopes = ${@Global.getConfig('user.dataScopes','[]')},
 dataScopeTrees = {}; // 用sysCode分类存储所有菜单树
 for (var i=0; i<dataScopes.length; i++){
 	var dataScope = dataScopes[i];
@@ -129,7 +129,7 @@ for (var i=0; i<dataScopes.length; i++){
 	$.ajax({
 		type: 'POST',
 		url: "${ctx}" + ctrlDataUrl + (ctrlDataUrl.indexOf("?")!=-1?'&':'?') + "___t=" + new Date().getTime(),
-		data: {ctrlPermi: '${ctrlPermi}'},
+		data: {ctrlPermi: '${@Global.getConfig("user.adminCtrlPermi", "2")}'},
 		dataType: 'json',
 		async: false,
 		error: function(data){