1、mail原始日志查询添加三个查询条件：

searchMailFrom(发件人)、searchMailTo(收件人)、searchSubject(主题)；
2、clickhouse查询时使用StringEscapeUtils.unescapeHtml4对String类型的查询条件进行转义

src/main/java/com/nis/domain/restful/NtcMailLog.java

@@ -1,5 +1,6 @@
 package com.nis.domain.restful;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.LogEntity;
 import com.wordnik.swagger.annotations.ApiModelProperty;
 
@@ -23,6 +24,10 @@ public class NtcMailLog extends LogEntity{
     @ApiModelProperty(value="EML文件转储路径", required=true)
     protected String emlFile;
     
+    protected String searchMailFrom;	//发件人
+    protected String searchMailTo; 	//收件人
+    protected String searchSubject;		//主题
+
     public String getMailProto() {
         return mailProto;
     }
@@ -77,4 +82,25 @@ public class NtcMailLog extends LogEntity{
 		this.emlKey = emlKey;
 	}
 	
+	public void setSearchMailFrom(String searchMailFrom) {
+		this.searchMailFrom = searchMailFrom;
+	}
+	@JsonIgnore
+	public String getSearchMailFrom() {
+		return searchMailFrom;
+	}
+	public void setSearchMailTo(String searchMailTo) {
+		this.searchMailTo = searchMailTo;
+	}
+	@JsonIgnore
+	public String getSearchMailTo() {
+		return searchMailTo;
+	}
+	public void setSearchSubject(String searchSubject) {
+		this.searchSubject = searchSubject;
+	}
+	@JsonIgnore
+	public String getSearchSubject() {
+		return searchSubject;
+	}
 }

src/main/java/com/nis/web/service/LogDataService.java

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.ibatis.mapping.ResultMap;
 import org.apache.ibatis.mapping.ResultMapping;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -168,7 +169,7 @@ public class LogDataService {
 									if (field.equals("url")) {
 										whereSB.append(" and " + field + " like '" + value.toString().trim() + "%'");
 									} else {
-										whereSB.append(" and " + field + "='" + value.toString().trim() + "'");
+										whereSB.append(" and " + field + "='" + StringEscapeUtils.unescapeHtml4(value.toString().trim()) + "'");
 									}
 								} else if (type.equals("java.lang.Integer") || type.equals("int")
 										|| type.equals("java.lang.Long") || type.equals("long")) {