qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.9.9.2312.01' into release/个税版本

This commit is contained in:
钱涛 2023-11-29 17:46:31 +08:00
parent 895da67d46 3f61807401
commit d9a27c2b9a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/enums/common/FilterEnum.java
View File

@ -13,7 +13,7 @@ public enum FilterEnum implements BaseEnum<String> {
BT("BT", "包含", 1) {
@Override
public Predicate<String> filter(List<String> 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<String> {
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<String> {
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));
}
};
}