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}),'%') - AND (a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER} OR a.CFDS_LEVEL=${cfdsLevel/10}) + AND a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER} 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