From 3f618074016850f6542ba79364f4c79fc921e7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 29 Nov 2023 17:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B8=E7=AE=97=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=8F=AF=E8=83=BD=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/enums/common/FilterEnum.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/enums/common/FilterEnum.java b/src/com/engine/salary/enums/common/FilterEnum.java index 52fbd970e..c3d1ea2a5 100644 --- a/src/com/engine/salary/enums/common/FilterEnum.java +++ b/src/com/engine/salary/enums/common/FilterEnum.java @@ -13,7 +13,7 @@ public enum FilterEnum implements BaseEnum { BT("BT", "包含", 1) { @Override public Predicate filter(List params) { - return a -> a.contains(params.get(0)); + return a -> a != null && a.contains(params.get(0)); } }, EQ("EQ", "等于", 1) { @@ -23,7 +23,7 @@ public enum FilterEnum implements BaseEnum { if (NumberUtils.isCreatable(a) && NumberUtils.isCreatable(params.get(0))) { return new BigDecimal(a).compareTo(new BigDecimal(params.get(0))) == 0; } else { - return a.equals(params.get(0)); + return a != null && a.equals(params.get(0)); } }; } @@ -35,7 +35,7 @@ public enum FilterEnum implements BaseEnum { if (NumberUtils.isCreatable(a) && NumberUtils.isCreatable(params.get(0))) { return new BigDecimal(a).compareTo(new BigDecimal(params.get(0))) != 0; } else { - return !a.equals(params.get(0)); + return a != null && !a.equals(params.get(0)); } }; }