From e04a3cfe29914cc7418504e78701dd512fed0d3a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 11:50:00 +0800
Subject: [PATCH] feat: 计划时间格式调整为年月日+时分秒;多选报工人;生产报工只能看指定报告人

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