From df8d7baa455c6bf778bfa772d5288f4b2ba0f13b Mon Sep 17 00:00:00 2001
From: dujie <dujie@syxysoft.com>
Date: Fri, 7 Apr 2023 16:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20bug=E3=80=9167864=20=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E7=94=A8=E6=88=B7=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/modules/UserRecycleBinModal.vue    | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/system/modules/UserRecycleBinModal.vue b/jero-web/src/views/system/modules/UserRecycleBinModal.vue
index 5ff746d0..9bf50f7f 100644
--- a/jero-web/src/views/system/modules/UserRecycleBinModal.vue
+++ b/jero-web/src/views/system/modules/UserRecycleBinModal.vue
@@ -43,7 +43,7 @@
       </template>
 
       <span slot="action" slot-scope="text, record">
-        <a @click="handleRevert([record.id])"><a-icon type="redo"/> 还原用户</a>
+        <a @click="handleRevert([record.id],[record.username])"><a-icon type="redo"/> 还原用户</a>
         <a-divider type="vertical"/>
         <a @click="handleDelete([record.id])"><a-icon type="delete"/> 彻底删除</a>
       </span>
@@ -134,19 +134,17 @@ export default {
       this.innerVisible = false
     },
     // 还原用户
-    handleRevert (userIds, userName) {
+    handleRevert (userIds, username) {
       this.$confirm({
         title: '恢复用户',
-        // content: `您确定要恢复这 ${userIds.length} 个用户吗？`,
-        content: `是否还原选中用户？`,
+        content: `是否还原用户${username}？`,
         centered: true,
         onOk: () => {
           postAction(this.url.putRecycleBin, { userIds: userIds.join(',') }).then((res) => {
             if (res.success) {
               this.handleOk()
               this.handleClearSelection()
-              // this.$message.success(`还原 ${userIds.length} 个用户成功！`)
-              this.$message.success(`选中用户还原成功！`)
+              this.$message.success(`${username}用户还原成功！`)
             }
           })
         }
@@ -176,7 +174,20 @@ export default {
       })
     },
     handleRevertBatch () {
-      this.handleRevert(this.selectedRowKeys)
+      this.$confirm({
+        title: '恢复用户',
+        content: `是否还原选中用户？`,
+        centered: true,
+        onOk: () => {
+          postAction(this.url.putRecycleBin, { userIds: this.selectedRowKeys.join(',') }).then((res) => {
+            if (res.success) {
+              this.handleOk()
+              this.handleClearSelection()
+              this.$message.success(`选中用户还原成功！`)
+            }
+          })
+        }
+      })
     },
     handleDeleteBatch () {
       this.handleDelete(this.selectedRowKeys)