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)); } }; }