diff --git a/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStatusMatrixPrivateDataSourceHandler.java b/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStatusMatrixPrivateDataSourceHandler.java index 41d868ce44a770628801e8795c147dcbaa025dac..15ea5b18b724623c3bfe4f40ea7fc727ed6c22d9 100644 --- a/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStatusMatrixPrivateDataSourceHandler.java +++ b/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStatusMatrixPrivateDataSourceHandler.java @@ -107,11 +107,11 @@ public class ProcessTaskStatusMatrixPrivateDataSourceHandler implements IMatrixP continue; } String expression = filter.getExpression(); - if (StringUtils.isNotBlank(expression)) { + if (StringUtils.isBlank(expression)) { expression = SearchExpression.EQ.getExpression(); } if (Objects.equals(expression, SearchExpression.EQ.getExpression())) { - if (!Objects.equals(filter.getValueList().get(0), statusValue)) { + if (!filter.getValueList().contains(statusValue)) { return false; } } else if (Objects.equals(expression, SearchExpression.NE.getExpression())) { diff --git a/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStepStatusMatrixPrivateDataSourceHandler.java b/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStepStatusMatrixPrivateDataSourceHandler.java index 297a63e463e5bfb38e7230bfd0dff02609ab9859..ed851c73f04be2a950f82f3e84c691118295ba4c 100644 --- a/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStepStatusMatrixPrivateDataSourceHandler.java +++ b/src/main/java/neatlogic/module/process/matrix/handler/ProcessTaskStepStatusMatrixPrivateDataSourceHandler.java @@ -111,7 +111,7 @@ public class ProcessTaskStepStatusMatrixPrivateDataSourceHandler implements IMat expression = SearchExpression.EQ.getExpression(); } if (Objects.equals(expression, SearchExpression.EQ.getExpression())) { - if (!Objects.equals(filter.getValueList().get(0), statusValue)) { + if (!filter.getValueList().contains(statusValue)) { return false; } } else if (Objects.equals(expression, SearchExpression.NE.getExpression())) {