From 5a5eaba2299ae6386c98685e4aac1f1bb1968f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 28 Jun 2023 17:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java      |  2 +-
 jero-web/src/views/phoneView/toDoCenter.vue           | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index f78b0a372..90b9d3af2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2134,7 +2134,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         List<ParamsCollectManifestEO> list = list(queryWrapper);
         int number = (int) list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
                 || CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())).count();
-        if (number == list.size() && list.size() > 0) {
+        if (number == list.size() && list.size() >= 0) {
             return true;
         } else {
             return false;
diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue
index a21923ced..e8fd14881 100644
--- a/jero-web/src/views/phoneView/toDoCenter.vue
+++ b/jero-web/src/views/phoneView/toDoCenter.vue
@@ -458,8 +458,9 @@
       },
       toDoCenterClick(row, isTrue) {
         let query = {}
-        if (!this.form.flowType) {
-          this.form.flowType = []
+        let flowType = ''
+        if (this.form.flowType && this.form.flowType instanceof Array){
+          flowType = this.form.flowType.join(',')
         }
         row.taskId = row.taskId + ''
         if (row.taskId.length > 30) {
@@ -488,7 +489,7 @@
             activeTab: this.activeTab,
             checked: this.form.checked,
             selectModel: this.form.selectModel,
-            searchFlowType: this.form.flowType.join(',')
+            searchFlowType: flowType
           }
           this.$router.push({
             path: '/phoneProcessManagement',
@@ -512,7 +513,7 @@
             goRouter: '/phoneToDoCenter',
             searchValue: this.phoneQueryValue,
             activeTab: this.activeTab,
-            searchFlowType: this.form.flowType.join(','),
+            searchFlowType: flowType,
             checked: this.form.checked,
             selectModel: this.form.selectModel
           }
@@ -534,7 +535,7 @@
                 goRouter: '/phoneToDoCenter',
                 searchValue: this.phoneQueryValue,
                 activeTab: this.activeTab,
-                searchFlowType: this.form.flowType.join(','),
+                searchFlowType: flowType,
                 checked: this.form.checked,
                 selectModel: this.form.selectModel
               }