From 9a861d922925fb538f4ba9ccb5a48ead24c18a24 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Wed, 9 Jan 2019 16:49:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9A=E8=81=94=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=9F=9F=E5=90=8D=E5=9B=BD=E9=99=85=E5=8C=96=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=20=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=90=8E=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java    | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp | 4 ++--
 2 files changed, 3 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 dda6137dc..99b8409f4 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -2420,7 +2420,7 @@ public class BaseController {
 			 logTime+="  "+msgProp.getProperty("begin_date")+"："+log.getSearchFoundStartTime();
 		 }
 		 if(log.getSearchFoundEndTime()!=null){
-			 logTime+="  "+msgProp.getProperty("end_date")+"："+log.getSearchFoundStartTime();
+			 logTime+="  "+msgProp.getProperty("end_date")+"："+log.getSearchFoundEndTime();
 		 }
 		return logTime;		
 	}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
index 8c0f26218..666cffa9b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
@@ -286,7 +286,7 @@
                                 
                                 <div class="col-md-2">
 									<div class="form-group">
-                                		<label class="control-label"><spring:message code='Web'/>：</label>
+                                		<label class="control-label"><spring:message code="domain_name"/>：</label>
 										<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
 											<c:forEach items="${webList}" var="web" >
 												<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
@@ -360,7 +360,7 @@
 
 								<th class="sort-column app_id" column="APP">APP</th>
 								<th class="sort-column proto_id" column="application_layer_protocol"><spring:message code="application_layer_protocol"/></th>
-								<th class="sort-column web_id" column="Web"><spring:message code="domain_name"/></th>
+								<th class="sort-column web_id" column="domain_name"><spring:message code="domain_name"/></th>
 								
 								<th class="sort-column cap_ip"  column="clj_ip"><spring:message code="clj_ip"/></th>
 								<th class="sort-column trans_proto" column="transport_layer_protocol" isVisible="false"><spring:message code="transport_layer_protocol"/></th>