From 71003be6c015f847dfe30d81eab78d474c6d2222 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Tue, 11 Dec 2018 21:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=B1=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=90=8E=E6=96=B0=E5=A2=9E=E5=90=8C=E5=90=8D?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEbug=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java        | 2 +-
 .../java/com/nis/web/dao/configuration/FileTransferCfgDao.xml   | 2 +-
 .../java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml     | 2 +-
 src/main/resources/nis.properties                               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index c956e956c..acd3d815d 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -837,7 +837,7 @@ public class BaseController {
 			if (StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
 				Calendar time = Calendar.getInstance();
 				String searchEndTime = DateUtils.formatDateTime(time.getTime());
-				time.add(Calendar.MINUTE, -5);
+				time.add(Calendar.MINUTE, -(Constants.LOG_TIME_RANGE/1000/60));
 				String searchStartTime = DateUtils.formatDateTime(time.getTime());
 				
 				params.put("searchFoundStartTime", searchStartTime);
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 91f992fb2..5a81dd91a 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} OR a.CFDS_LEVEL=${cfdsLevel/10})
+	   			AND a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER}
 	   		</if>
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
diff --git a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
index def400aae..1134253fd 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml
@@ -475,7 +475,7 @@
 		FROM 
 			ip_reuse_addr_pool r 
 		WHERE 
-			r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1
+			r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1 AND r.is_audit != 3
 	</select>
 	
 	<select id="checkAddrPoolIp" resultType="com.nis.domain.basics.IpReuseIpCfg">
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index e8d6a9a97..aa76c59af 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -522,7 +522,7 @@ app_id_region=APP_ID
 app_spec_service_code_max_val=310000
 app_spec_service_code_min_val=300001
 groupReuseSources=groupReuseSources
-log_time_range=3600000
+log_time_range=300000
 log_time_start=2018-08-01 00:00:00
 log_time_end=2018-10-01 00:00:00
 area_tag=location