From 355fa8e3cba9c66b54ebcdf1acd99c2e8ac1ca67 Mon Sep 17 00:00:00 2001
From: tanghao <default@DESKTOP-7FEGRP2>
Date: Sun, 27 Jan 2019 16:24:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A6=96=E9=A1=B5=E9=9D=A2=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AD=97=E4=BD=93=E6=9C=AA=E5=AF=B9=E9=BD=90?=
 =?UTF-8?q?=202.=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE-=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7bug=203.?=
 =?UTF-8?q?ASN=20IP=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=87=BAbug(=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=B8=BA=E5=85=AC=E5=85=B1=E7=95=8C=E9=9D=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=B6=85=E8=BF=87=E9=98=88=E5=80=BC=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=85=B1=E6=80=A7BUG)=204.ASN=20IP=E4=B8=8B=E6=8B=89=E6=A1=86o?=
 =?UTF-8?q?nchange=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/sql/20190126/alter_table_sysuser.sql | 3 +++
 src/main/webapp/WEB-INF/tags/sys/delRow.tag             | 2 ++
 src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp   | 6 +++---
 src/main/webapp/WEB-INF/views/home.jsp                  | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/sql/20190126/alter_table_sysuser.sql

diff --git a/src/main/resources/sql/20190126/alter_table_sysuser.sql b/src/main/resources/sql/20190126/alter_table_sysuser.sql
new file mode 100644
index 000000000..da7055def
--- /dev/null
+++ b/src/main/resources/sql/20190126/alter_table_sysuser.sql
@@ -0,0 +1,3 @@
+#Remove Sysuser Index
+ALTER TABLE `sys_user`
+DROP INDEX `AK_loginid_unique`;
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index db67b470f..95d3de5d9 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -527,6 +527,7 @@ function cancelPassOpt(url){
 			url+="&hColumns="+hColumn.toString();
 		}
 		var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+		
 		//导出选中数据
 		if($(checkboxes).filter(":checked").length>0){ 
 			doAll(checkboxes,url);
@@ -540,6 +541,7 @@ function cancelPassOpt(url){
 								$("#searchForm").attr("action",url);
 								$("#searchForm").submit();
 								closeTip();
+								$("#searchForm").attr("action",searchUrl);
 							}
 						},{buttonsFocus:1});
 						top.$('.jbox-body .jbox-icon').css('top','55px');
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
index 04e2fe0fe..47c448608 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -24,9 +24,9 @@
 		});
  		//筛选功能初始化
 		filterActionInit();
-		//$("#isAudit").change(function(){
-		//	page();
-		//});
+		$("#isAudit").change(function(){
+			page();
+		});
 		//reset
 		$("#resetBtn").on("click",function(){
 			$("select.selectpicker").each(function(){
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp
index 28ceed752..9825f5486 100644
--- a/src/main/webapp/WEB-INF/views/home.jsp
+++ b/src/main/webapp/WEB-INF/views/home.jsp
@@ -415,7 +415,7 @@ background:#3d3d3d;
 							<li><a href="${ctx}/sys/user/info" target="mainFrame"><i class="icon-user"></i>&nbsp; <spring:message code="userInfo"></spring:message></a></li>
 							<li><a href="${ctx}/sys/user/modifyPwd" target="mainFrame"><i class="icon-lock"></i>&nbsp; <spring:message code="updatePwd"></spring:message></a></li>
 							<li><a href="${pageContext.request.contextPath }/logout" >
-								<i class="icon-key"></i> <spring:message code="exit"></spring:message></a></li>
+								<i class="icon-key"></i>&nbsp;  <spring:message code="exit"></spring:message></a></li>
 						</ul></li>
 					<!-- END USER LOGIN DROPDOWN -->