From 39c187d6ecc96e8686adbfe07ffcd5b592b89c3f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 12 Apr 2019 19:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/dict/data/data.html    | 11 +++--------
 .../resources/templates/system/role/authUser.html     | 11 +++--------
 .../resources/templates/system/role/selectUser.html   | 11 +++--------
 3 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
index 06cedfc8..e2af0293 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
@@ -122,14 +122,9 @@
 		});
 		
 		function queryParams(params) {
-			return {
-				dictType:       $("#dictType").val(),
-				pageSize:       params.limit,
-    			pageNum:        params.offset / params.limit + 1,
-    			searchValue:    params.search,
-    			orderByColumn:  params.sort,
-    			isAsc:          params.order
-			};
+			var search = $.table.queryParams(params);
+			search.dictType = $("#dictType").val();
+			return search;
 		}
 		
 		/*字典数据-新增字典*/
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/authUser.html b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
index f61f9ef0..64902355 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
@@ -114,14 +114,9 @@
 		});
 		
 		function queryParams(params) {
-			return {
-				roleId:         $("#roleId").val(),
-				pageSize:       params.limit,
-    			pageNum:        params.offset / params.limit + 1,
-    			searchValue:    params.search,
-    			orderByColumn:  params.sort,
-    			isAsc:          params.order
-			};
+			var search = $.table.queryParams(params);
+			search.roleId = $("#roleId").val();
+			return search;
 		}
 		
 		/* 分配用户-选择用户 */
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html b/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
index 0650df3a..fa98d8fd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
@@ -100,14 +100,9 @@
 		});
 		
 		function queryParams(params) {
-			return {
-				roleId:         $("#roleId").val(),
-				pageSize:       params.limit,
-    			pageNum:        params.offset / params.limit + 1,
-    			searchValue:    params.search,
-    			orderByColumn:  params.sort,
-    			isAsc:          params.order
-			};
+			var search = $.table.queryParams(params);
+			search.roleId = $("#roleId").val();
+			return search;
 		}
 		
 		/* 添加用户-选择用户-提交 */