From bb688add0bfca6eda2cbeb0d55407f5327e3cce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=9A=93=E5=AE=B8?= <liguilong@iie.ac.cn>
Date: Fri, 18 Jan 2019 10:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A3=80=E7=B4=A2->=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E6=97=A5=E5=BF=97->=E9=82=AE=E4=BB=B6=E6=B3=9B?=
 =?UTF-8?q?=E6=94=B6=20=E7=A7=BB=E9=99=A4=E9=A1=B5=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=85=8D=E7=BD=AEID=E5=92=8C=E5=8A=A8=E4=BD=9C?=
 =?UTF-8?q?=E5=88=97,=E5=AF=BC=E5=87=BA=E7=A7=BB=E9=99=A4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEID=E5=92=8C=E5=8A=A8=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/ntc/MailRecordLogController.java      |  2 +-
 .../WEB-INF/views/log/ntc/mailRecordList.jsp  | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java
index e9f077f8c..2b16197f3 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MailRecordLogController.java
@@ -150,7 +150,7 @@ public class MailRecordLogController extends BaseController {
 			} else {
 				hColumns += ",";
 			}
-			String cfgIndexInfoNoExport = "," + hColumns;
+			String cfgIndexInfoNoExport = ",action,cfg_id," + hColumns;
 			noExportMap.put("mail_record", cfgIndexInfoNoExport);
 			dataMap.put("mail_record", list);
 			String timeRange = initLogMap(log, "mail_record");
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
index 43b625b04..e931b1451 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailRecordList.jsp
@@ -237,8 +237,8 @@
 						<thead>
 							<tr>
 								<th><spring:message code="log"/></th>
-								<th class="sort-column cfg_id "  isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th>
-								<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th>
+<%-- 								<th class="sort-column cfg_id "  isVisible="false" column="cfg_id"><spring:message code="cfg_id"/></th> --%>
+<%-- 								<th class="sort-column service" isVisible="false" column="action"><spring:message code="action"/></th> --%>
 								<th class="sort-column found_time" column="found_time"><spring:message code="found_time"/></th>
 								<th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th>
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
@@ -284,16 +284,16 @@
 <%-- 									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span> --%>
 										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/mail/ajaxMailSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
-									<td>${log.cfgId }</td>
-									<td>
-										<c:set var="actions">${log.action }</c:set>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
-											<c:if test="${dict.itemCode eq log.action}">
-												<c:set var="actions">${dict.itemValue}</c:set>
-											</c:if>
-										</c:forEach>
-										<spring:message code="${actions}"/>
-									</td>
+<%-- 									<td>${log.cfgId }</td> --%>
+<!-- 									<td> -->
+<%-- 										<c:set var="actions">${log.action }</c:set> --%>
+<%-- 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> --%>
+<%-- 											<c:if test="${dict.itemCode eq log.action}"> --%>
+<%-- 												<c:set var="actions">${dict.itemValue}</c:set> --%>
+<%-- 											</c:if> --%>
+<%-- 										</c:forEach> --%>
+<%-- 										<spring:message code="${actions}"/> --%>
+<!-- 									</td> -->
 									<td>${log.foundTime }</td>
 									<td>${log.recvTime }</td>