From 26352f1b9c967f4abc1e00880e43404ff6352def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Fri, 25 Aug 2023 15:44:18 +0800
Subject: [PATCH] =?UTF-8?q?CN-1258=20fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E6=90=9C=E7=B4=A2=E6=A1=86=E5=A4=9A=E4=B8=AA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8Ehas=E5=87=BD=E6=95=B0=E5=B9=B6=E5=88=97?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8Chas=E5=87=BD=E6=95=B0=E5=89=8D=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91and=E6=93=8D=E4=BD=9C=E7=AC=A6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/advancedSearch/meta/parser.js         | 6 +++++-
 src/utils/tools.js                                   | 7 +++++--
 src/views/charts/charts/chartDetectionPagination.vue | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/advancedSearch/meta/parser.js b/src/components/advancedSearch/meta/parser.js
index 93ccfe21..ca890c5f 100644
--- a/src/components/advancedSearch/meta/parser.js
+++ b/src/components/advancedSearch/meta/parser.js
@@ -857,7 +857,11 @@ export function handleMetaListToStr (metaList) {
     for (const i in lastObj) {
       str += lastObj[i] + ' AND '
     }
-    str = str.slice(0, -5) + ' ' + hasStr.slice(0, -5)
+    if (hasStr !== '') {
+      str = str + hasStr.slice(0, -5)
+    } else {
+      str = str.slice(0, -5)
+    }
 
     return str
   }
diff --git a/src/utils/tools.js b/src/utils/tools.js
index 5ef290d3..465d66b8 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -1586,9 +1586,12 @@ const handleStrToUniteStr = (str) => {
     for (const i in lastObj) {
       lastStr += lastObj[i] + ' AND '
     }
-    lastStr = lastStr.slice(0, -5)
     const hasStr = hasArr.join(' AND ')
-    lastStr = lastStr + ' ' + hasStr
+    if (hasStr !== '') {
+      lastStr = lastStr + hasStr
+    } else {
+      lastStr = lastStr.slice(0, -5)
+    }
 
     return lastStr
   }
diff --git a/src/views/charts/charts/chartDetectionPagination.vue b/src/views/charts/charts/chartDetectionPagination.vue
index 839a360c..cacf170d 100644
--- a/src/views/charts/charts/chartDetectionPagination.vue
+++ b/src/views/charts/charts/chartDetectionPagination.vue
@@ -12,7 +12,7 @@
     >
       <span>/&nbsp;{{totalPage}}</span>
     </el-pagination>
-  </div>  
+  </div>
 </template>
 
 <script>