Explorar o código

!304 修复isMatchedIp的参数判断产生NullPointerException的问题
Merge pull request !304 from wangfeiyu/dev20230222

若依 %!s(int64=3) %!d(string=hai) anos
pai
achega
c42b4cad02

+ 1 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java

@@ -357,7 +357,7 @@ public class IpUtils
357 357
      */
358 358
     public static boolean isMatchedIp(String filter, String ip)
359 359
     {
360
-        if (StringUtils.isEmpty(filter) && StringUtils.isEmpty(ip))
360
+        if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
361 361
         {
362 362
             return false;
363 363
         }