From b73ceb15b15e0c03ca601ced7b84445623cea40a Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Wed, 14 Nov 2018 09:16:20 +0800
Subject: [PATCH] =?UTF-8?q?ddos=20=E6=97=A5=E5=BF=97=E5=8E=BB=E6=8E=89isbl?=
 =?UTF-8?q?ock=20=E6=9D=A1=E4=BB=B6=20=EF=BC=8C=E4=BF=9D=E7=95=99=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BF=9D=E6=8A=A4ip=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/log/ntc/DdosLogController.java  |  4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp     | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
index 697e2b1e0..3a64bf723 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java
@@ -55,12 +55,12 @@ public class DdosLogController extends BaseController{
 			Map<String, Object> params=new HashMap<>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
-			if(entry!=null&&entry.getIsBlock()!=null) {
+			/*if(entry!=null&&entry.getIsBlock()!=null) {
 				params.put("searchIsBlock", entry.getIsBlock());
 			}else {
 				entry.setIsBlock(1);//默认保护ddos日志
 				params.put("searchIsBlock", entry.getIsBlock());
-			}
+			}*/
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 492a59613..9c60730a7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -31,8 +31,8 @@ $(document).ready(function(){
 	<div class="theme-panel hidden-xs hidden-sm">
 	</div>
 	<h3 class="page-title">
-		<c:if test="${log.isBlock eq 1 }"><spring:message code="protected_ddos"/></c:if>
-		<c:if test="${log.isBlock eq 0 }"><spring:message code="usual_ddos"/></c:if>
+		<spring:message code="protected_ddos"/>
+<%-- 		<c:if test="${log.isBlock eq 0 }"><spring:message code="usual_ddos"/></c:if> --%>
 	</h3>
 	
 	<h5 class="page-header"></h5>
@@ -142,13 +142,15 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
-								</div>
-								<div class="row">
+									
 									<div class="col-md-2">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
 								</div>
+								
+									
+								
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>