From 9249fadd92f2c4c4721ea0043794da35ae156f8a Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Fri, 15 Jun 2018 10:31:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=A2=9E=E5=8A=A0cfgId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java | 3 +++
 src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp    | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp        | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 97a7ed1f7..678f67007 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -525,5 +525,8 @@ public class BaseController {
 		if (entry.getEntranceId()!=null) {
 			params.put("searchEntranceId", entry.getEntranceId());
 		}
+		if (entry.getCfgId()!=null) {
+			params.put("searchCfgId", entry.getCfgId());
+		}
 	}
 }
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index 3c1ecb391..31dc305a8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -70,7 +70,7 @@ $(document).ready(function(){
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
 	                             	</div>
 	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
 											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index bbdb94328..0789ec797 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -77,7 +77,7 @@ $(document).ready(function(){
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
 	                             	</div>
 	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
 											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index ebbf14580..6ed4ffe7f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -77,7 +77,7 @@ $(document).ready(function(){
 							<div class="pull-left">	
 				 				  <div class="input-group">
 	                                 <div class="input-group-btn">
-										<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
+										<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
 	                             	</div>
 	                                 	<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control input-medium Wdate "
 											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>