diff --git a/src/main/java/com/nis/domain/restful/NtcMailLog.java b/src/main/java/com/nis/domain/restful/NtcMailLog.java
index 80fb255..a6ed73c 100644
--- a/src/main/java/com/nis/domain/restful/NtcMailLog.java
+++ b/src/main/java/com/nis/domain/restful/NtcMailLog.java
@@ -1,80 +1,106 @@
-package com.nis.domain.restful;
-
-import com.nis.domain.LogEntity;
-import com.wordnik.swagger.annotations.ApiModelProperty;
-
-/**
- * Created by darnell on 2018/6/11.
- */
-public class NtcMailLog extends LogEntity{
-
-    private static final long serialVersionUID = 2541894088824218908L;
-
-    @ApiModelProperty(value="邮件协议类型", required=true)
-    protected String mailProto;
-    @ApiModelProperty(value="发件人", required=true)
-    protected String mailFrom;
-    @ApiModelProperty(value="收件人", required=true)
-    protected String mailTo;
-    @ApiModelProperty(value="主题", required=true)
-    protected String subject;
-    @ApiModelProperty(value="EML文件KEY", required=true)
-    protected String emlKey;
-    @ApiModelProperty(value="EML文件转储路径", required=true)
-    protected String emlFile;
-
-    public String getMailProto() {
-        return mailProto;
-    }
-
-    public void setMailProto(String mailProto) {
-        this.mailProto = mailProto;
-    }
-
-    public String getMailFrom() {
-        return mailFrom;
-    }
-
-    public void setMailFrom(String mailFrom) {
-        this.mailFrom = mailFrom;
-    }
-
-    public String getMailTo() {
-        return mailTo;
-    }
-
-    public void setMailTo(String mailTo) {
-        this.mailTo = mailTo;
-    }
-
-    public String getSubject() {
-        return subject;
-    }
-
-    public void setSubject(String subject) {
-        this.subject = subject;
-    }
-
-    public String getEmlFile() {
-        return emlFile;
-    }
-
-    public void setEmlFile(String emlFile) {
-        this.emlFile = emlFile;
-    }
-    
-    /**
-	 * @return the emlKey
-	 */
-	public String getEmlKey() {
-		return emlKey;
-	}
-	
-	/**
-	 * @param emlKey the emlKey to set
-	 */
-	public void setEmlKey(String emlKey) {
-		this.emlKey = emlKey;
-	}
-	
-}
+package com.nis.domain.restful;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.nis.domain.LogEntity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
+
+/**
+ * Created by darnell on 2018/6/11.
+ */
+public class NtcMailLog extends LogEntity{
+
+    private static final long serialVersionUID = 2541894088824218908L;
+
+    @ApiModelProperty(value="邮件协议类型", required=true)
+    protected String mailProto;
+    @ApiModelProperty(value="发件人", required=true)
+    protected String mailFrom;
+    @ApiModelProperty(value="收件人", required=true)
+    protected String mailTo;
+    @ApiModelProperty(value="主题", required=true)
+    protected String subject;
+    @ApiModelProperty(value="EML文件KEY", required=true)
+    protected String emlKey;
+    @ApiModelProperty(value="EML文件转储路径", required=true)
+    protected String emlFile;
+    
+    protected String searchMailFrom;	//发件人
+    protected String searchMailTo; 	//收件人
+    protected String searchSubject;		//主题
+
+    public String getMailProto() {
+        return mailProto;
+    }
+
+    public void setMailProto(String mailProto) {
+        this.mailProto = mailProto;
+    }
+
+    public String getMailFrom() {
+        return mailFrom;
+    }
+
+    public void setMailFrom(String mailFrom) {
+        this.mailFrom = mailFrom;
+    }
+
+    public String getMailTo() {
+        return mailTo;
+    }
+
+    public void setMailTo(String mailTo) {
+        this.mailTo = mailTo;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getEmlFile() {
+        return emlFile;
+    }
+
+    public void setEmlFile(String emlFile) {
+        this.emlFile = emlFile;
+    }
+    
+    /**
+	 * @return the emlKey
+	 */
+	public String getEmlKey() {
+		return emlKey;
+	}
+	
+	/**
+	 * @param emlKey the emlKey to set
+	 */
+	public void setEmlKey(String emlKey) {
+		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;
+	}
+}
diff --git a/src/main/java/com/nis/web/service/LogDataService.java b/src/main/java/com/nis/web/service/LogDataService.java
index 9060663..d585450 100644
--- a/src/main/java/com/nis/web/service/LogDataService.java
+++ b/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")) {