From bc6246822b3df8e906d7750be8efc06e853ce349 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 11 Dec 2019 22:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/views/modules/sys/logForm.html     | 2 +-
 .../resources/views/modules/sys/user/empUserForm.html     | 8 ++++----
 .../views/modules/sys/user/empUserFormAuthDataScope.html  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/logForm.html b/modules/core/src/main/resources/views/modules/sys/logForm.html
index e8faf7e0..ec977018 100644
--- a/modules/core/src/main/resources/views/modules/sys/logForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/logForm.html
@@ -53,7 +53,7 @@
 							<label class="control-label col-sm-2" title="">
 								<span class="required hide">*</span> 提交的数据：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-10">
-								<#form:textarea path="requestParams" rows="1" class="form-control "/>
+								<#form:textarea path="requestParams" rows="1" class="form-control autoHeight"/>
 							</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 b84c12b2..071aaa87 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
@@ -188,7 +188,7 @@
 					</div>
 				</div>
 				<% } %>
-				<% if(op == 'add' || op == 'auth') { %>
+				<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { %>
 				<div class="form-unit">${text('分配角色')}</div>
 				<div class="pl10 pb20">
 					<table id="roleGrid"></table>
@@ -202,7 +202,7 @@
 			<div class="box-footer">
 				<div class="row">
 					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('sys:empUser:edit')){ %>
+						<% if (hasPermi('sys:empUser:edit,sys:empUser:authRole', 'or')){ %>
 							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
 						<% } %>
 						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>
@@ -267,7 +267,7 @@ $("#empOfficeGrid").dataGrid({
 		
 	}
 });
-<% if(op == 'add' || op == 'auth') {%>
+<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) {%>
 // 加载角色列表
 var roleGrid = $("#roleGrid").dataGrid({
 	url: '${ctx}/sys/role/treeData',
@@ -295,7 +295,7 @@ var roleGrid = $("#roleGrid").dataGrid({
 <% } %>
 $("#inputForm").validate({
 	submitHandler: function(form){
-		<% if(op == 'add' || op == 'auth') { // 获取选中角色  %>
+		<% if(hasPermi('sys:empUser:authRole') && (op == 'add' || op == 'auth')) { // 获取选中角色  %>
 		$("#userRoleString").val(roleGrid.dataGrid('getSelectRows').join(','));
 		<% } %>
 		var empNo = $('#employee_empNo').val();
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 80e2bdf8..4c9fe5d8 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
@@ -60,7 +60,7 @@
 			<div class="box-footer">
 				<div class="row">
 					<div class="col-sm-offset-2 col-sm-10">
-						<% if (hasPermi('sys:empUser:edit')){ %>
+						<% if (hasPermi('sys:empUser:authDataScope')){ %>
 							<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> ${text('保 存')}</button>&nbsp;
 						<% } %>
 						<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> ${text('关 闭')}</button>