From 4b21a3bc48963ef6e85de832ca05f7b6ee40f6dc Mon Sep 17 00:00:00 2001
From: wangfeiyu <wangfeiyu@cscec.com>
Date: Wed, 22 Feb 2023 08:54:10 +0800
Subject: [PATCH] 在方法isMatchedIp的参数中，当filter为null而ip非null/空时，报filter为null异常。把判断条件由&&改为||解决此bug。
---
ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
index c8ab47f..7877b68 100644
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
@@ -1,6 +1,5 @@
package com.ruoyi.job.domain;
-import java.io.Serializable;
import java.util.Date;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -19,7 +18,7 @@
*
* @author ruoyi
*/
-public class SysJob extends BaseEntity implements Serializable
+public class SysJob extends BaseEntity
{
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.3