forked from sgd

parent: 1ef82d75 | patch | commit | ignore whitespace
若依
2023-02-22 c42b4cad02785491da59ca98b59d7705f7000758 
!304 修复isMatchedIp的参数判断产生NullPointerException的问题
Merge pull request !304 from wangfeiyu/dev20230222
1 files modified
2 ■■■■■ changed files
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java 2 ●●●●● patch | view | raw | blame | history 
 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/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;



        }