From b812bbac5b2bac49ba96a0a0c7307e40a515a051 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 3 Sep 2018 14:43:05 +0800
Subject: [PATCH] =?UTF-8?q?(1)asn=20=E7=BB=84=E9=80=89=E6=8B=A9=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E6=90=9C=E7=B4=A2=20(2)asn=20ip=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=20asn=20ip=E7=BB=84=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E5=A4=8D,ip=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=8A=B6=E6=80=81=E4=BF=9D=E5=AD=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20(3)DNS=20ip=E7=95=8C=E9=9D=A2ip=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=8A=B6=E6=80=81=E4=BF=9D=E5=AD=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml   |  6 +++---
 .../webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp    |  2 +-
 .../webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp |  2 +-
 src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp  | 10 ++++------
 src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp |  2 +-
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp     |  4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
index b53303456..b63525dfd 100644
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
@@ -61,7 +61,7 @@
 		left join sys_user u on r.auditor_id=u.id
     	<trim prefix="WHERE" prefixOverrides="AND |OR ">
     		<if test="page !=null and page.where != null and page.where != ''">
-				 AND ${page.where}
+				AND ${page.where}
 			</if>
     		<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
@@ -69,8 +69,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="asnIpGroupName != null and asnIpGroupName != ''">
-	    		AND dns.group_name like concat(concat('%',#{asnIpGroupName,jdbcType=VARCHAR}),'%') 
+	    	<if test="asnIpGroup != null and asnIpGroup != ''">
+	    		AND r.asn_Ip_Group =#{asnIpGroup,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="cfgRegionCode != null">
 	    		AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
index ff3958537..59ec3e8c5 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
@@ -122,7 +122,7 @@ var reSort=function(obj,index){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="group"/></label>
 								            <div class="col-md-6">
-								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required">
+								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 								            		<%-- <option value="0" ><spring:message code="default_group"/></option>--%>
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
index e068ca654..eaa612d83 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
@@ -66,7 +66,7 @@ $(function(){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="group"/></label>
 								            <div class="col-md-6">
-								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required">
+								            	<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
index 51a67c0c5..bb0bb0f2d 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -8,11 +8,9 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.srcIpAddress}"){
-			$("#intype").val("${cfg.srcIpAddress}");
-		}else if("${cfg.srcPort}"){
-			$("#intype").val("${cfg.srcPort}");
-		} else{
+		}else if("${cfg.destIpAddress}"){
+			$("#intype").val("${cfg.destIpAddress}");
+		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
 		$("#seltype").change(function(){
@@ -85,7 +83,7 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
-                       				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" >
+                       				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
                        				 	<form:option value=""><spring:message code='asn_ip_group'/></form:option>
                        				 	<c:forEach items="${policyGroups}" var="policyGroup">
                        				 	<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
index 6a1fe48ce..c04db97ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
@@ -73,7 +73,7 @@ $(function(){
 								        <div class="form-group">
 								            <label class="control-label col-md-3"><spring:message code="group"/></label>
 								            <div class="col-md-6">
-								            	<select name="userRegion1" class="selectpicker show-tick form-control required">
+								            	<select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
 					               					<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.groupId}" <c:if test="${_cfg.userRegion1==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 01e62f164..30a35f7db 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -8,8 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.srcIpAddress}"){
-			$("#intype").val("${cfg.srcIpAddress}");
+		}else if("${cfg.destIpAddress}"){
+			$("#intype").val("${cfg.destIpAddress}");
 		}else if("${cfg.srcPort}"){
 			$("#intype").val("${cfg.srcPort}");
 		} else{