From e4ccbc66010f7c26ea4b014fe6199b41dd9667af Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 07 Nov 2024 22:15:27 +0800
Subject: [PATCH] 支持自定义显示Excel属性列
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
index b410fda..3316240 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
@@ -357,7 +357,7 @@
*/
public static boolean isMatchedIp(String filter, String ip)
{
- if (StringUtils.isEmpty(filter) && StringUtils.isEmpty(ip))
+ if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
{
return false;
}
--
Gitblit v1.9.2