From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
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