From df0445054b85274d2b7f1acdc87ae59b3f3dfed3 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Tue, 11 Dec 2018 19:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=BA=A6=E6=A3=80=E7=B4=A2sql=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/configuration/FileTransferCfgDao.xml | 2 +-
 .../WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp    | 9 ++-------
 src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp       | 4 ----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
index 5a81dd91a..91f992fb2 100644
--- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
@@ -1091,7 +1091,7 @@
 	    		AND a.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="cfdsLevel != null">
-	   			AND a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER}
+	   			AND (a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER} OR a.CFDS_LEVEL=${cfdsLevel/10})
 	   		</if>
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
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 a067d295e..548f18069 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -418,17 +418,12 @@
 								    </td>
 								    <td>${indexCfg.rawLen }（B）</td>
 								    <td>
-								    	<%-- <c:if test="${indexCfg.cfdsLevel > 1 && indexCfg.cfdsLevel <= 10}">
+								    	<c:if test="${indexCfg.cfdsLevel > 1 && indexCfg.cfdsLevel <= 10}">
 								    		${(indexCfg.cfdsLevel*10)}
 								    	</c:if>
 								    	<c:if test="${indexCfg.cfdsLevel eq 1 || indexCfg.cfdsLevel > 10}">
 								    		${indexCfg.cfdsLevel }
-								    	</c:if> --%>
-								    	<c:forEach items="${fns:getDictList('CONFIDENCE_INTERVAL')}" var="configdenceC">
-											<c:if test="${configdenceC.itemCode eq indexCfg.cfdsLevel}">
-												${configdenceC.itemValue}
-											</c:if>
-										</c:forEach>
+								    	</c:if>
 								    </td>
 								    <td>
 								    	<a href="${indexCfg.fileUrl }" target="_blank" data-original-title="${indexCfg.fileUrl }"
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index a808052c2..0e9f16aa6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -223,10 +223,6 @@
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
 								</div>
-								<%-- <div class="col-md-2">
-									<label><spring:message code="cfg_id"></spring:message>：</label>
-									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
-								</div> --%>
 							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->