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

This commit is contained in:
RuoYi 2023-02-22 10:29:28 +08:00
parent 3402b69556
commit 90970eb9fe
2 changed files with 2 additions and 2 deletions

View File

@ -145,7 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
}
/**
* 计算时间差单位分钟
* 计算时间差
*
* @param endTime 最后时间
* @param startTime 开始时间

View File

@ -357,7 +357,7 @@ public class IpUtils
*/
public static boolean isMatchedIp(String filter, String ip)
{
if (StringUtils.isEmpty(filter) && StringUtils.isEmpty(ip))
if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
{
return false;
}