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 e3fd62ddf..b13e98b8d 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 @@ -41,6 +41,17 @@ public class MailLogController extends BaseController { params.put("pageNo", page.getPageNo()); initLogSearchValue(log, params); + // 增加收/发件人、邮件主题查询 + if (StringUtils.isNotBlank(log.getMailTo())) { + params.put("searchMailTo", log.getMailTo()); + } + if (StringUtils.isNotBlank(log.getMailFrom())) { + params.put("searchMailFrom", log.getMailFrom()); + } + if (StringUtils.isNotBlank(log.getSubject())) { + params.put("searchSubject", log.getSubject()); + } + List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); model.addAttribute("serviceList", serviceList); diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp index 548f18069..a067d295e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -418,12 +418,17 @@ ${indexCfg.rawLen }(B) - + <%-- ${(indexCfg.cfdsLevel*10)} ${indexCfg.cfdsLevel } - + --%> + + + ${configdenceC.itemValue} + +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ <%--
-
+
--%>