From 4eeb403ab81c2cd88e2f8004913afff64f0142e3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 27 二月 2026 17:46:01 +0800
Subject: [PATCH] 设备保养-任务记录增加备注字段; 供应商档案增加供应商类型字段,由字典维护;

---
 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