From fcc58f1b0d386acd934d0f57f5f0f52835a38c52 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 9 May 2018 21:46:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E7=94=A8Mybatis-PageHelper=E7=9A=84Co?=
 =?UTF-8?q?untPage=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BC=98=E5=8C=96count?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=EF=BC=8C=E6=84=9F=E8=B0=A2abel533=EF=BC=9B?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90BaseEntity=E6=9C=AA?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=AD=A3=EF=BC=9BIE=E4=B8=8Bajax?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/sys/user/empUserFormAuthDataScope.html       | 3 ++-
 .../main/resources/views/modules/sys/user/empUserIndex.html    | 2 +-
 .../main/resources/views/modules/sys/user/secAdminForm.html    | 3 ++-
 parent/pom.xml                                                 | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

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 d3139ce1..cc24e7a1 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
@@ -136,9 +136,10 @@ for (var i=0; i<dataScopes.length; i++){
 	}
  	$('#dataScopeTrees').append(js.template('dataScopeTpl', {
  		key: dataScope.ctrlType, label: dataScope.ctrlName_${lang()} || dataScope.ctrlName}));
+ 	var ctrlDataUrl = dataScope.ctrlDataUrl || '';
 	$.ajax({
 		type: 'POST',
-		url: "${ctx}" + dataScope.ctrlDataUrl,
+		url: "${ctx}" + ctrlDataUrl + (ctrlDataUrl.indexOf("?")!=-1?'&':'?') + "___t=" + new Date().getTime(),
 		data: {ctrlPermi: '2'},
 		dataType: 'json',
 		async: false,
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 f53315a4..c4b17ba9 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
@@ -43,7 +43,7 @@ var setting = {view:{selectedMulti:false},data:{key:{title:"title"},simpleData:{
 		win.page();
 	}}
 }, tree, loadTree = function(){
-	js.ajaxSubmit("${ctx}/sys/office/treeData", {ctrlPermi:'2'/*1拥有的权限 2管理的权限*/}, function(data){
+	js.ajaxSubmit("${ctx}/sys/office/treeData?___t=" + new Date().getTime(), {ctrlPermi:'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/secAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html
index 64da30cf..6ee3e11c 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
@@ -136,9 +136,10 @@ for (var i=0; i<dataScopes.length; i++){
 	}
  	$('#dataScopeTrees').append(js.template('dataScopeTpl', {
  		key: dataScope.ctrlType, label: dataScope.ctrlName_${lang()} || dataScope.ctrlName}));
+ 	var ctrlDataUrl = dataScope.ctrlDataUrl || '';
 	$.ajax({
 		type: 'POST',
-		url: "${ctx}" + dataScope.ctrlDataUrl,
+		url: "${ctx}" + ctrlDataUrl + (ctrlDataUrl.indexOf("?")!=-1?'&':'?') + "___t=" + new Date().getTime(),
 		data: {ctrlPermi: '2'},
 		dataType: 'json',
 		async: false,
diff --git a/parent/pom.xml b/parent/pom.xml
index 712e6a9b..858242a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -32,6 +32,7 @@
 		<!-- framework version setting -->
 		<mybatis.version>3.4.5</mybatis.version>
 		<mybatis-spring.version>1.3.1</mybatis-spring.version>
+		<jsqlparser.version>1.1</jsqlparser.version>
 		<druid.version>1.1.3</druid.version>
 		<shiro.version>1.4.0</shiro.version>
 		<beetl.version>2.7-SNAPSHOT</beetl.version>