diff --git a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
index e58745d36..72da7d9be 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java
@@ -91,13 +91,17 @@ public class DnsLogController extends BaseController {
 			Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
 			Map<String, List> dataMap = new HashMap<String, List>();
 			Map<String, String> noExportMap = new HashMap<String, String>();
-			// ---------------------------
 			PageLog<NtcDnsLog> page = new PageLog<NtcDnsLog>(request, response);
+			List<NtcDnsLog> list = new ArrayList<NtcDnsLog>();
 			page.setPageNo(1);
 			page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
+			// ---------------------------
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
+			if (StringUtils.isNotBlank(log.getQname())) {
+				params.put("searchQname", log.getQname());
+			}
 			initLogSearchValue(log, params);
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
@@ -105,15 +109,14 @@ public class DnsLogController extends BaseController {
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_DNS_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
-			List<NtcDnsLog> list = new ArrayList<NtcDnsLog>();
-			if (StringUtils.isNotBlank(recv)) {
-				Gson gson = new GsonBuilder().create();
-				LogRecvData<NtcDnsLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcDnsLog>>() {
-				}.getType());
-				if (fromJson.getStatus().intValue() == 200) {
-					Page<NtcDnsLog> data = fromJson.getData();
-					list = data.getList();
-				}
+			Gson gson = new GsonBuilder().create();
+
+			LogRecvData<NtcDnsLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcDnsLog>>() {
+			}.getType());
+
+			if (fromJson.getStatus().intValue() == 200) {
+				Page<NtcDnsLog> data = fromJson.getData();
+				list = data.getList();
 			}
 			for (NtcDnsLog l : list) {
 				l.setFunctionId(log.getFunctionId());
@@ -132,8 +135,8 @@ public class DnsLogController extends BaseController {
 			dataMap.put("DNS", list);
 			/* } */
 			if ("csv".equals(type)) {
-				this._exportCsv(model, request, response, redirectAttributes, "DNS", titleList, classMap,
-						dataMap, noExportMap);
+				this._exportCsv(model, request, response, redirectAttributes, "DNS", titleList, classMap, dataMap,
+						noExportMap);
 			} else {
 				this._export(model, request, response, redirectAttributes, "DNS", titleList, classMap, dataMap,
 						noExportMap);
diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java
index b5ff8cd77..783ecd011 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/HttpKeyLogController.java
@@ -99,6 +99,9 @@ public class HttpKeyLogController extends BaseController {
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
+			if (StringUtils.isNotBlank(log.getUrl())) {
+				params.put("searchUrl", log.getUrl());
+			}
 			initLogSearchValue(log, params);
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
index b0a5a645b..7afebf511 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
@@ -114,6 +114,22 @@ public class HttpLogController extends BaseController {
 			initLogSearchValue(log, params);
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			serviceList.addAll(DictUtils.getFunctionServiceDictList(635));
+			for (FunctionServiceDict serviceDict : serviceList) {
+				if (serviceDict.getFunctionId() == log.getFunctionId()) {
+					if (serviceDict.getAction() == Constants.MONIT_ACTION) {
+						serviceDict.setActionCode("log_search_http_monit");
+					} else if (serviceDict.getAction() == Constants.REJECT_ACTION) {
+						serviceDict.setActionCode("log_search_http_reject");
+					}
+				} else {
+					if (serviceDict.getAction() == Constants.MONIT_ACTION) {
+						serviceDict.setActionCode("log_search_keyword_monit");
+					} else if (serviceDict.getAction() == Constants.REJECT_ACTION) {
+						serviceDict.setActionCode("log_search_keyword_reject");
+					}
+				}
+			}
 			model.addAttribute("serviceList", serviceList);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_LOG;
@@ -145,8 +161,8 @@ public class HttpLogController extends BaseController {
 			dataMap.put("HTTP", list);
 			/* } */
 			if ("csv".equals(type)) {
-				this._exportCsv(model, request, response, redirectAttributes, "HTTP", titleList, classMap,
-						dataMap, noExportMap);
+				this._exportCsv(model, request, response, redirectAttributes, "HTTP", titleList, classMap, dataMap,
+						noExportMap);
 			} else {
 				this._export(model, request, response, redirectAttributes, "HTTP", titleList, classMap, dataMap,
 						noExportMap);
diff --git a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
index 8f14dc0ec..91a085d3a 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/MailLogController.java
@@ -110,6 +110,17 @@ public class MailLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
 
+			// 增加收/发件人、邮件主题查询
+			if (StringUtils.isNotBlank(log.getMailTo())) {
+				params.put("searchMailTo", StringEscapeUtils.unescapeHtml(log.getMailTo()));
+			}
+			if (StringUtils.isNotBlank(log.getMailFrom())) {
+				params.put("searchMailFrom", StringEscapeUtils.unescapeHtml(log.getMailFrom()));
+			}
+			if (StringUtils.isNotBlank(log.getSubject())) {
+				params.put("searchSubject", StringEscapeUtils.unescapeHtml(log.getSubject()));
+			}
+			
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
diff --git a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java
index 3ee8920f9..5f97fda33 100644
--- a/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/SslLogController.java
@@ -95,21 +95,25 @@ public class SslLogController extends BaseController {
 			Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
 			Map<String, List> dataMap = new HashMap<String, List>();
 			Map<String, String> noExportMap = new HashMap<String, String>();
-			// ---------------------------
 			PageLog<NtcSslLog> page = new PageLog<NtcSslLog>(request, response);
+			List<NtcSslLog> list = new ArrayList<NtcSslLog>();
 			page.setPageNo(1);
 			page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
+			// ---------------------------
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
+			// 请求参数判断
 			initLogSearchValue(log, params);
+			if (StringUtils.isNotBlank(log.getSni())) {
+				params.put("SearchSni", log.getSni());
+			}
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 
 			String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
-			List<NtcSslLog> list = new ArrayList<NtcSslLog>();
 			if (StringUtils.isNotBlank(recv)) {
 				Gson gson = new GsonBuilder().create();
 				LogRecvData<NtcSslLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcSslLog>>() {
@@ -136,8 +140,8 @@ public class SslLogController extends BaseController {
 			dataMap.put("ssl_control", list);
 			/* } */
 			if ("csv".equals(type)) {
-				this._exportCsv(model, request, response, redirectAttributes, "ssl_control", titleList, classMap, dataMap,
-						noExportMap);
+				this._exportCsv(model, request, response, redirectAttributes, "ssl_control", titleList, classMap,
+						dataMap, noExportMap);
 			} else {
 				this._export(model, request, response, redirectAttributes, "ssl_control", titleList, classMap, dataMap,
 						noExportMap);
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 9a98ad502..9e7c01999 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -418,15 +418,22 @@ function cancelPassOpt(url){
 		//导出检索条件下所有数据
 		}else{
 			var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim();
-			if(totalCount > maxRow){
-				top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
-					if(v=="ok"){
+			if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) {
+				if(totalCount > maxRow){
+						top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
+							if(v=="ok"){
+								$("#searchForm").attr("action",url);
+								$("#searchForm").submit();
+								closeTip();
+							}
+						},{buttonsFocus:1});
+						top.$('.jbox-body .jbox-icon').css('top','55px');
+					}else{
 						$("#searchForm").attr("action",url);
 						$("#searchForm").submit();
 						closeTip();
-					}
-				},{buttonsFocus:1});
-				top.$('.jbox-body .jbox-icon').css('top','55px');
+						$("#searchForm").attr("action",searchUrl);
+				}
 			}else{
 				$("#searchForm").attr("action",url);
 				$("#searchForm").submit();
@@ -435,4 +442,13 @@ function cancelPassOpt(url){
 			}
 		}
 	}
+	
+	 function confirmEnding(str, target) {
+		 var result=true;
+		 var num=str.indexOf(target);
+		 if (-1==num) {
+			 result=false;
+		}
+		 return result;
+	}
 </script>
\ No newline at end of file