From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 12 七月 2025 10:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly
---
src/main/java/com/ruoyi/common/utils/ip/IpUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
index b410fda..3316240 100644
--- a/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+++ b/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.3