From e0446920705542092e815585d0e76741417cbd81 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Mon, 23 Oct 2023 19:45:01 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-102182=20=E3=80=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=89=E6=9C=9F=E3=80=91=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E5=88=86=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=EF=BC=8C=E9=A1=B5=E9=9D=A2=E4=B8=8D=E4=BC=9A=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/vcs/VcsProcessFailedWrapper.java     | 14 ++++++++++++++
 .../fr/design/mainframe/vcs/ui/RecyclePane.java    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java
index 0a257ce2e4..93d7d93479 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java
@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.vcs;
 
 import com.fr.report.entity.VcsEntity;
+import com.fr.stable.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,6 +52,19 @@ public class VcsProcessFailedWrapper {
         return detailList;
     }
 
+    /**
+     * 是否失败
+     */
+    public boolean isFalse(VcsTableEntity entity) {
+        for (VcsEntity vcsEntity : failedList) {
+            if (StringUtils.equals(vcsEntity.getFilename(), entity.getFilename())
+                    && vcsEntity.getVersion() == entity.getEntity().getVersion()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * 处理是否全部成功
      */
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
index 9f19008ee4..1aacaa9d7b 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
@@ -232,7 +232,7 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
     }
 
     private void updateVcsUI(VcsProcessFailedWrapper wrapper) {
-        tableEntities = model.getList().stream().filter(tableEntity -> !tableEntity.isSelect() || wrapper.getFailedNameList().contains(tableEntity.getFilename())).collect(Collectors.toList());
+        tableEntities = model.getList().stream().filter(tableEntity -> !tableEntity.isSelect() || wrapper.isFalse(tableEntity)).collect(Collectors.toList());
         model.setList(new ArrayList<>(tableEntities));
         model.fireTableDataChanged();
         fireVcsListener(model.getList());