From b0bd2d45930c276e2ac3b72b3a7751f301cf4a9e Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 22 Mar 2018 15:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/configuration/DnsIpCfgDao.xml     |  7 +++++--
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp    | 11 ++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
index 2b49a37ef..696cc60a8 100644
--- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
@@ -57,7 +57,7 @@
     	<if test="searchCreateTimeEnd != null">
     		and dic.create_time &lt;= #{searchCreateTimeEnd}
     	</if>
-    	<if test="searchEditTimeStart != null">
+    	<!-- <if test="searchEditTimeStart != null">
     		and dic.create_time &gt;= #{searchEditTimeStart}
     	</if>
     	<if test="searchEditTimeEnd != null">
@@ -71,7 +71,7 @@
     	</if>
     	<if test="isAudit != null">
     		and dic.is_audit = #{isAudit}
-    	</if>
+    	</if> -->
     	<if test="request != null and request.id != null">
     		and dic.request_id = #{request.id}
     	</if>
@@ -84,6 +84,9 @@
     	<if test="lable != null and lable != ''">
     		and concat(",", dic.lable, ",") like concat("%,", #{lable}, ",%")
     	</if>
+    	<if test="cfgDesc != null and cfgDesc != ''">
+    		and dic.cfg_desc like concat("%", #{cfgDesc}, "%")
+    	</if>
     </select>
     
     <select id="get" resultMap="dnsIpCfgMap">
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 6494a753c..6589c4134 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -89,7 +89,7 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="dns_ip_cfg"></spring:message>
+		<spring:message code="ip_spoofing_configuration"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
@@ -107,13 +107,14 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
-									<form:select path="isAudit" class="selectpicker select2 input-small">
+									<%-- <form:select path="isAudit" class="selectpicker select2 input-small">
 										<form:option value=""><spring:message code="all"></spring:message><spring:message code="state"></spring:message></form:option>
 										<form:option value="0"><spring:message code="created"></spring:message></form:option>
 										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
 										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
-									</form:select>
+									</form:select> --%>
+									<input name="cfgDesc" class="form-control input-medium" placeholder="<spring:message code="config_describe"/>" value="${dnsIpCfg.cfgDesc }"/>
 								</div>
 								<div class="pull-left">
 									<c:set var="request_number"><spring:message code='request_number'/></c:set>
@@ -205,7 +206,7 @@
 											
 									</div>
 							
-									<div class="col-md-6">
+									<%-- <div class="col-md-6">
 										<div class="pull-left">
 											<label><spring:message code="edit_time"/>：</label>
 										</div>
@@ -237,7 +238,7 @@
 											<input name="searchAuditTimeEnd" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate"
 											value="<fmt:formatDate value="${dnsIpCfg.searchAuditTimeEnd}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
-									</div>
+									</div> --%>
 								</div>
 							</div>