Commit 90970eb9 authored by RuoYi's avatar RuoYi

修复isMatchedIp的参数判断产生空指针的问题

parent 3402b695
...@@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils ...@@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
} }
/** /**
* 计算时间差(单位:分钟) * 计算时间差
* *
* @param endTime 最后时间 * @param endTime 最后时间
* @param startTime 开始时间 * @param startTime 开始时间
......
...@@ -357,7 +357,7 @@ public class IpUtils ...@@ -357,7 +357,7 @@ public class IpUtils
*/ */
public static boolean isMatchedIp(String filter, String ip) public static boolean isMatchedIp(String filter, String ip)
{ {
if (StringUtils.isEmpty(filter) && StringUtils.isEmpty(ip)) if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
{ {
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment