From 5da0520832d6cae44df3625e32911c950402d28f Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 13 May 2019 17:49:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E6=9D=83=E9=99=90=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AEuser.adminCtrlPermi=EF=BC=8C1=E6=8B=A5?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=9D=83=E9=99=90=202=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=EF=BC=8C=E6=97=A0=E9=99=90=E7=BA=A7?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=BA=94=E7=94=A8=E5=9C=BA=E6=99=AF=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml   | 8 ++++++--
 .../src/main/resources/views/modules/sys/companyForm.html | 2 +-
 .../src/main/resources/views/modules/sys/companyList.html | 2 +-
 .../src/main/resources/views/modules/sys/officeForm.html  | 2 +-
 .../src/main/resources/views/modules/sys/officeList.html  | 2 +-
 .../resources/views/modules/sys/user/corpAdminForm.html   | 2 +-
 .../resources/views/modules/sys/user/empOfficeForm.html   | 2 +-
 .../resources/views/modules/sys/user/empUserForm.html     | 6 +++---
 .../views/modules/sys/user/empUserFormAuthDataScope.html  | 5 ++---
 .../resources/views/modules/sys/user/empUserIndex.html    | 3 ++-
 .../resources/views/modules/sys/user/empUserList.html     | 6 +++---
 .../resources/views/modules/sys/user/secAdminForm.html    | 5 ++---
 web/src/main/resources/config/application.yml             | 5 ++++-
 13 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index b995cb4c..7045cd16 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -47,8 +47,9 @@ jdbc:
   # JTA 分布式事务（v4.0.4+）
   jta:
     enabled: false
-    # 事务超时时间，单位毫秒（3分钟）
-    transactionTimeout: 180000
+    
+  # 事务超时时间，单位秒（30分钟）（v4.1.5+）
+  transactionTimeout: 1800
 
   # 表名前缀
   tablePrefix: js_
@@ -147,6 +148,9 @@ user:
       remarks: ""
     }]
     
+  # 管理功能的控制权限类型（1拥有的权限 2管理的权限）（v4.1.5+）
+  adminCtrlPermi: 2
+  
   # 多租户模式（SAAS模式）（专业版）
   useCorpModel: false
   
diff --git a/modules/core/src/main/resources/views/modules/sys/companyForm.html b/modules/core/src/main/resources/views/modules/sys/companyForm.html
index 04680b20..453a4132 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyForm.html
@@ -19,7 +19,7 @@
 							<div class="col-sm-8">
 								<#form:treeselect id="parent" title="${text('上级公司')}"
 									path="parent.id" labelPath="parent.companyName" 
-									url="${ctx}/sys/company/treeData?excludeCode=${company.id}&ctrlPermi=2"
+									url="${ctx}/sys/company/treeData?excludeCode=${company.id}&ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}"
 									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
 							</div>
 						</div>
diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html
index b53fd8f3..57fa5470 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyList.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyList.html
@@ -18,7 +18,7 @@
 		<div class="box-body">
 			<#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide"
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<#form:hidden name="ctrlPermi" value="2"/>
+				<#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/>
 				<div class="form-group">
 					<label class="control-label">${text('公司代码')}：</label>
 					<div class="control-inline">
diff --git a/modules/core/src/main/resources/views/modules/sys/officeForm.html b/modules/core/src/main/resources/views/modules/sys/officeForm.html
index 5d37372e..7abe54e2 100644
--- a/modules/core/src/main/resources/views/modules/sys/officeForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/officeForm.html
@@ -19,7 +19,7 @@
 							<div class="col-sm-8">
 								<#form:treeselect id="parent" title="${text('上级机构')}"
 									path="parent.id" labelPath="parent.officeName" 
-									url="${ctx}/sys/office/treeData?excludeCode=${office.id}&ctrlPermi=2"
+									url="${ctx}/sys/office/treeData?excludeCode=${office.id}&ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}"
 									class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/>
 							</div>
 						</div>
diff --git a/modules/core/src/main/resources/views/modules/sys/officeList.html b/modules/core/src/main/resources/views/modules/sys/officeList.html
index 8f038bb1..fc6afb1a 100644
--- a/modules/core/src/main/resources/views/modules/sys/officeList.html
+++ b/modules/core/src/main/resources/views/modules/sys/officeList.html
@@ -18,7 +18,7 @@
 		<div class="box-body">
 			<#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide"
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<#form:hidden name="ctrlPermi" value="2"/>
+				<#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/>
 				<div class="form-group">
 					<label class="control-label">${text('机构代码')}：</label>
 					<div class="control-inline">
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 984a8ad9..4c95dc7b 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
@@ -176,7 +176,7 @@ var roleGrid = $("#roleGrid").dataGrid({
 	url: '${ctx}/sys/role/treeData',
 	postData: [
 <%// 	{name:'userType',value:'employee'}, // 指定用户类型的角色 %>
-<%// 	{name:'ctrlPermi',value:'2'} 		// 过滤可管理的角色 %>
+<%// 	{name:'ctrlPermi',value:'${@Global.getConfig("user.adminCtrlPermi", "2")}'} 		// 过滤可管理的角色 %>
 		{name:'isAll',value:'true'} 	<%  // 显示所有角色（与上方两个条件互斥） %>
 	],
 	columnModel: [
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empOfficeForm.html b/modules/core/src/main/resources/views/modules/sys/user/empOfficeForm.html
index af6483b8..c1be2e94 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empOfficeForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empOfficeForm.html
@@ -21,7 +21,7 @@
 							<div class="col-sm-5">
 								<#form:treeselect id="office" title="${text('机构选择')}"
 									path="officeCode" labelPath="officeName" readonly="${!employeeOffice.isNewRecord}"
-									url="${ctx}/sys/office/treeData?ctrlPermi=2" class="required" allowClear="false"/>
+									url="${ctx}/sys/office/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" class="required" allowClear="false"/>
 							</div>
 						</div>
 					</div>
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
index 341b8744..baa4058f 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html
@@ -25,7 +25,7 @@
 							<div class="col-sm-8">
 								<#form:treeselect id="office" title="${text('机构选择')}"
 									path="employee.office.officeCode" labelPath="employee.office.officeName" 
-									url="${ctx}/sys/office/treeData?ctrlPermi=2" class="required" allowClear="false"/>
+									url="${ctx}/sys/office/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" class="required" allowClear="false"/>
 							</div>
 						</div>
 					</div>
@@ -36,7 +36,7 @@
 							<div class="col-sm-8">
 								<#form:treeselect id="company" title="${text('公司选择')}"
 									path="employee.company.companyCode" labelPath="employee.company.companyName" 
-									url="${ctx}/sys/company/treeData?ctrlPermi=2" btnClass="" allowClear="true"/>
+									url="${ctx}/sys/company/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" btnClass="" allowClear="true"/>
 							</div>
 						</div>
 					</div>
@@ -269,7 +269,7 @@ var roleGrid = $("#roleGrid").dataGrid({
 	url: '${ctx}/sys/role/treeData',
 	postData: [
 		{name:'userType',value:'employee'},
-		{name:'ctrlPermi',value:'2'}
+		{name:'ctrlPermi',value:'${@Global.getConfig("user.adminCtrlPermi", "2")}'}
 	],
 	columnModel: [
 		{header:'${text("角色名称")}', name:'name', sortable:false, width:100, align:"center"},
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
index cc24e7a1..80e2bdf8 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserFormAuthDataScope.html
@@ -130,8 +130,7 @@ for (var i=0; i<dataScopes.length; i++){
 		continue;
 	}
 	// 控制权限 ctrlPermi: 0全部  1拥有权限  2管理权限
-	if (!(dataScope.ctrlPermi == '0'
-			|| dataScope.ctrlPermi == '1')){
+	if (!(dataScope.ctrlPermi == '0' || dataScope.ctrlPermi == '1')){
 		continue;
 	}
  	$('#dataScopeTrees').append(js.template('dataScopeTpl', {
@@ -140,7 +139,7 @@ for (var i=0; i<dataScopes.length; i++){
 	$.ajax({
 		type: 'POST',
 		url: "${ctx}" + ctrlDataUrl + (ctrlDataUrl.indexOf("?")!=-1?'&':'?') + "___t=" + new Date().getTime(),
-		data: {ctrlPermi: '2'},
+		data: {ctrlPermi: '${@Global.getConfig("user.adminCtrlPermi", "2")}'},
 		dataType: 'json',
 		async: false,
 		error: function(data){
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
index dc75620f..f7bee27a 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
@@ -44,7 +44,8 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		win.page();
 	}}
 }, tree, loadTree = function(){
-	js.ajaxSubmit("${ctx}/sys/office/treeData?___t=" + new Date().getTime(), {ctrlPermi:'2'/*1拥有的权限 2管理的权限*/}, function(data){
+	js.ajaxSubmit("${ctx}/sys/office/treeData?___t=" + new Date().getTime(),
+			{ctrlPermi:'${@Global.getConfig("user.adminCtrlPermi", "2")}'/*1拥有的权限 2管理的权限*/}, function(data){
 		tree = $.fn.zTree.init($("#tree"), setting, data);//.expandAll(true);
 		// 展开第一级节点
 		var nodes = tree.getNodesByParam("level", 0);
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
index b47c526b..32bef694 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
@@ -24,7 +24,7 @@
 		<div class="box-body">
 			<#form:form id="searchForm" model="${empUser}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline "
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<#form:hidden name="ctrlPermi" value="2"/>
+				<#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/>
 				<div class="form-group">
 					<label class="control-label">${text('账号')}：</label>
 					<div class="control-inline">
@@ -67,7 +67,7 @@
 					<div class="control-inline width-90">
 						<#form:treeselect id="office" title="${text('机构选择')}"
 								path="employee.office.officeCode" labelPath="employee.office.officeName" 
-								url="${ctx}/sys/office/treeData?ctrlPermi=2" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
+								url="${ctx}/sys/office/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
 					</div>
 				</div>
 				<div class="form-group">
@@ -75,7 +75,7 @@
 					<div class="control-inline width-90">
 						<#form:treeselect id="company" title="${text('公司选择')}"
 								path="employee.company.companyCode" labelPath="employee.company.companyName" 
-								url="${ctx}/sys/company/treeData?ctrlPermi=2" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
+								url="${ctx}/sys/company/treeData?ctrlPermi=${@Global.getConfig('user.adminCtrlPermi', '2')}" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
 					</div>
 				</div>
 				<div class="form-group">
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 6ee3e11c..c51fb437 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
@@ -130,8 +130,7 @@ for (var i=0; i<dataScopes.length; i++){
 		continue;
 	}
 	// 控制权限 ctrlPermi: 0全部  1拥有权限  2管理权限
-	if (!(dataScope.ctrlPermi == '0'
-			|| dataScope.ctrlPermi == '2')){
+	if (!(dataScope.ctrlPermi == '0' || dataScope.ctrlPermi == '2')){
 		continue;
 	}
  	$('#dataScopeTrees').append(js.template('dataScopeTpl', {
@@ -140,7 +139,7 @@ for (var i=0; i<dataScopes.length; i++){
 	$.ajax({
 		type: 'POST',
 		url: "${ctx}" + ctrlDataUrl + (ctrlDataUrl.indexOf("?")!=-1?'&':'?') + "___t=" + new Date().getTime(),
-		data: {ctrlPermi: '2'},
+		data: {ctrlPermi: '${@Global.getConfig("user.adminCtrlPermi", "2")}'},
 		dataType: 'json',
 		async: false,
 		error: function(data){
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 061a558b..8ad859cb 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -125,7 +125,7 @@ jdbc:
 #  jta:
 #    enabled: false
 
-#  # 事务超时时间，单位秒（30分钟）
+#  # 事务超时时间，单位秒（30分钟）（v4.1.5+）
 #  transactionTimeout: 1800
 
 #  # 表名前缀
@@ -247,6 +247,9 @@ logging:
 #      expandLevel: -1,
 #      remarks: ""
 #    }]
+#    
+#  # 管理功能的控制权限类型（1拥有的权限 2管理的权限）（v4.1.5+）
+#  adminCtrlPermi: 2
 #
 #  # 多租户模式（SAAS模式）（专业版）
 #  useCorpModel: false