From cbb5f8f0d578bbc21baaa1b8d3c69392dc55ae11 Mon Sep 17 00:00:00 2001
From: elliott <382696293@qq.com>
Date: Mon, 8 Jan 2024 18:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E6=9D=BF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flossom/system/service/impl/SysUserServiceImpl.java   | 8 +++++++-
 flossom-ui/src/views/system/role/index.vue                | 4 ++--
 flossom-ui/src/views/system/user/index.vue                | 6 +++---
 flossom-ui/src/views/system/wechatTag/index.vue           | 5 +++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java
index ca8279c..560fcec 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/SysUserServiceImpl.java
@@ -495,6 +495,7 @@ public class SysUserServiceImpl implements ISysUserService
         String password = configService.selectConfigByKey("sys.user.initPassword");
         for (SysUser user : userList)
         {
+            user.setUserId(null);
             try
             {
                 // 验证是否存在这个用户
@@ -542,7 +543,12 @@ public class SysUserServiceImpl implements ISysUserService
         {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
-        return successMsg.toString();
+        if (StringUtils.isNotEmpty(successMsg.toString()) && !"null".equals(successMsg.toString())) {
+            return successMsg.toString();
+        } else {
+            return failureMsg.toString();
+        }
+
     }
 
 }
diff --git a/flossom-ui/src/views/system/role/index.vue b/flossom-ui/src/views/system/role/index.vue
index fb3b5ef..da31a1f 100644
--- a/flossom-ui/src/views/system/role/index.vue
+++ b/flossom-ui/src/views/system/role/index.vue
@@ -598,8 +598,8 @@ export default {
     handleExport() {
       this.download('system/role/export', {
         ...this.queryParams
-      }, `role_${new Date().getTime()}.xlsx`)
+      }, `角色数据_${new Date().getTime()}.xlsx`)
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/flossom-ui/src/views/system/user/index.vue b/flossom-ui/src/views/system/user/index.vue
index ae87fe4..58d03b6 100644
--- a/flossom-ui/src/views/system/user/index.vue
+++ b/flossom-ui/src/views/system/user/index.vue
@@ -637,7 +637,7 @@ export default {
     handleExport() {
       this.download('system/user/export', {
         ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
+      }, `用户数据_${new Date().getTime()}.xlsx`)
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -647,7 +647,7 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      }, `用户管理模版_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -667,4 +667,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/flossom-ui/src/views/system/wechatTag/index.vue b/flossom-ui/src/views/system/wechatTag/index.vue
index affc144..97fdd82 100644
--- a/flossom-ui/src/views/system/wechatTag/index.vue
+++ b/flossom-ui/src/views/system/wechatTag/index.vue
@@ -284,6 +284,11 @@ export default {
       listDeptExcludeChild(row.id).then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      if (row.parentId == 0) {
+        this.showParent = 1;
+      } else {
+        this.showParent = 0;
+      }
     },
     /** 提交按钮 */
     submitForm: function() {