From 058c3ef07652e1e7c2d27351be14dd4775cfe70f Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 20 Dec 2024 15:38:36 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E4=B8=BA=E7=A7=81=E6=9C=89=E7=9F=A9=E9=98=B5=E6=97=B6?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=BE=E7=BD=AE=E8=BF=87=E6=BB=A4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E2=80=9C=E7=AD=89=E4=BA=8E=E2=80=9D=E8=A1=A8?=
 =?UTF-8?q?=E8=BE=BE=E5=BC=8F=E8=A6=81=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1315935720275968]表单下拉框组件数据源为私有矩阵时关联设置过滤条件中“等于”表达式要支持多个值 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1315935720275968
---
 .../ProcessTaskStatusMatrixPrivateDataSourceHandler.java      | 4 ++--
 .../ProcessTaskStepStatusMatrixPrivateDataSourceHandler.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 41d868ce4..15ea5b18b 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 297a63e46..ed851c73f 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())) {
-- 
Gitee