From 216c64b031e183761e090ce2e5c20fd7ed0513c9 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Fri, 18 Jan 2019 16:33:16 +0600
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9asn=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/basics/AsnIpCfgDao.xml    |  3 ++
 .../WEB-INF/views/basics/asnGroupList.jsp     | 34 +++++++++++++++++--
 .../WEB-INF/views/basics/asnIpCfgList.jsp     | 20 +++++++++--
 3 files changed, 53 insertions(+), 4 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 49825a600..02b0b48c4 100644
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
@@ -184,6 +184,9 @@
 	    	<if test="detail != null">
 	    		AND r.detail like concat(concat('%',#{detail,jdbcType=VARCHAR}),'%')
 	    	</if>
+	    	<if test="userRegion1 != null">
+	    		AND r.user_region1 like concat(concat('%',#{userRegion1,jdbcType=VARCHAR}),'%')
+	    	</if>
     		
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
diff --git a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
index 8a99ebe5c..4d19211c1 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
@@ -143,7 +143,7 @@
 								
 								<div class="pull-left">
 								
-									<div class="input-group">
+									<%-- <div class="input-group">
                                          <div class="input-group-btn">
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
@@ -157,7 +157,37 @@
                                          
                                          <input id="intype" class="form-control input-medium" type="text" value="">
                                   
-                                    </div> 
+                                    </div>  --%>
+                                   <div class="input-group">
+                                	<div class="input-group-btn">
+										<span class="form-control" ><spring:message code="organization"/></span>
+                                   	</div>
+									<input name="organization" id="organization" type="text" class="form-control input-medium" value="${cfg.organization}" />
+                          			</div>
+								</div>
+								<div class="pull-left">
+								    <div class="input-group">
+	                                	<div class="input-group-btn">
+											<span class="form-control" ><spring:message code="asn_no"/></span>
+	                                   	</div>
+										<input name="asnId" id="asnId" type="text" class="form-control input-medium" value="${cfg.asnId}" />
+	                          		</div>
+								</div>
+								<div class="pull-left">
+								    <div class="input-group">
+	                                	<div class="input-group-btn">
+											<span class="form-control" ><spring:message code="country"/></span>
+	                                   	</div>
+										<input name="country" id="country" type="text" class="form-control input-medium" value="${cfg.country}" />
+	                          		</div>
+								</div>
+								<div class="pull-left">
+								    <div class="input-group">
+	                                	<div class="input-group-btn">
+											<span class="form-control" ><spring:message code="detail"/></span>
+	                                   	</div>
+										<input name="detail" id="detail" type="text" class="form-control input-medium" value="${cfg.detail}" />
+	                          		</div>
 								</div>
 								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
index 04e2fe0fe..1bbb7a580 100644
--- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
@@ -11,7 +11,7 @@
 		}else if("${cfg.destIpAddress}"){
 			$("#intype").val("${cfg.destIpAddress}");
 		}else if("${cfg.organization}"){
-			$("#intype").val("${cfg.organization}");
+			//$("#intype").val("${cfg.organization}");
 		}else if("${cfg.country}"){
 			$("#intype").val("${cfg.country}");
 		}else if("${cfg.detail}"){
@@ -135,7 +135,7 @@
 												<form:option value="destIpAddress"><spring:message code="IP"></spring:message></form:option>
 												<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
-												<form:option value="organization"><spring:message code="organization"></spring:message></form:option>
+												<%-- <form:option value="organization"><spring:message code="organization"></spring:message></form:option> --%>
 												<form:option value="country"><spring:message code="country"></spring:message></form:option>
 												<form:option value="detail"><spring:message code="detail"></spring:message></form:option>
 											</form:select>
@@ -153,6 +153,22 @@
                                     </div> 
 								</div>
 								<div class="pull-left">
+                                   <div class="input-group">
+                                	<div class="input-group-btn">
+										<span class="form-control" ><spring:message code="organization"/></span>
+                                   	</div>
+									<input name="organization" id="organization" type="text" class="form-control input-medium" value="${cfg.organization}" />
+                          			</div>
+								</div>
+								<div class="pull-left">
+								    <div class="input-group">
+	                                	<div class="input-group-btn">
+											<span class="form-control" ><spring:message code="asn_no"/></span>
+	                                   	</div>
+										<input name="userRegion1" id="userRegion1" type="text" class="form-control input-medium" value="${cfg.userRegion1}" />
+	                          		</div>
+								</div>
+								<div class="pull-left">
 									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>