From b2bd49630636170451e27a947173c42a9f15cbbb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 30 Aug 2022 21:24:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B2=A1=E6=9C=89=E5=B8=A6=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/log/index.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/system/log/index.vue b/frontend/src/views/system/log/index.vue
index cda669ba3f..a900196581 100644
--- a/frontend/src/views/system/log/index.vue
+++ b/frontend/src/views/system/log/index.vue
@@ -170,11 +170,17 @@ export default {
         });
     },
     exportData() {
-      let condition = this.last_condition;
-      condition = formatQuickCondition(condition, "key");
-      const temp = formatCondition(condition);
-      const param = temp || {};
-      param["orders"] = formatOrders(this.orderConditions);
+      const param = {
+        orders: formatOrders(this.orderConditions),
+        conditions: [...this.cacheCondition],
+      };
+      if (this.nikeName) {
+        param.conditions.push({
+          field: `nick_name`,
+          operator: "like",
+          value: this.nikeName,
+        });
+      }
 
       exportExcel(param).then((res) => {
         const blob = new Blob([res], { type: "application/vnd.ms-excel" });