From 298ff021fe138807dfca1c869a53f5584f4fe690 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 27 Jun 2022 21:16:03 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7exc?=
 =?UTF-8?q?el=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/func.js          | 12 ++++++++++++
 src/views/system/user.vue |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/util/func.js b/src/util/func.js
index 9b9f692..c347c27 100644
--- a/src/util/func.js
+++ b/src/util/func.js
@@ -90,4 +90,16 @@ export default class func {
   static split(str) {
     return str ? String(str).split(',') : '';
   }
+
+  /**
+   * 转换空字符串
+   * @param str
+   * @returns {string|*}
+   */
+  static toStr(str) {
+    if (typeof str === 'undefined' || str === null) {
+      return "";
+    }
+    return str;
+  }
 }
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 831b2df..80ff0ef 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -188,6 +188,7 @@
   import {dateNow} from "@/util/date";
   import NProgress from 'nprogress';
   import 'nprogress/nprogress.css';
+  import func from "@/util/func";
 
   export default {
     data() {
@@ -902,13 +903,15 @@
         done();
       },
       handleExport() {
+        const account = func.toStr(this.search.account);
+        const realName = func.toStr(this.search.realName);
         this.$confirm("是否导出用户数据?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
           NProgress.start();
-          exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`).then(res => {
+          exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
             downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
             NProgress.done();
           })