From 93764fc5b545f59b7ee63b65cb9f343dc789bdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Wed, 24 May 2023 12:29:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E5=96=84=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.Infrastructure/Startup.cs           |  6 ------
 Yi.Furion.Net6/Yi.Furion.Sqlsugar.Core/Startup.cs    | 11 +++++++++++
 Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs         | 11 ++++++++++-
 Yi.RuoYi.Vue3/src/views/system/role/authUser.vue     |  4 ++--
 Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue   | 12 +++++++-----
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/Yi.Furion.Net6/Yi.Framework.Infrastructure/Startup.cs b/Yi.Furion.Net6/Yi.Framework.Infrastructure/Startup.cs
index 4114c717..a2622871 100644
--- a/Yi.Furion.Net6/Yi.Framework.Infrastructure/Startup.cs
+++ b/Yi.Furion.Net6/Yi.Framework.Infrastructure/Startup.cs
@@ -34,11 +34,5 @@ public class Startup : AppStartup
 
     }
 
-    public async void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-    {
-        app.UseSqlsugarCodeFirstServer();
-        await app.UseDataSeedServer();
-        app.UseDataFiterServer();
 
-    }
 }
diff --git a/Yi.Furion.Net6/Yi.Furion.Sqlsugar.Core/Startup.cs b/Yi.Furion.Net6/Yi.Furion.Sqlsugar.Core/Startup.cs
index e3abcbae..d1a3658f 100644
--- a/Yi.Furion.Net6/Yi.Furion.Sqlsugar.Core/Startup.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Sqlsugar.Core/Startup.cs
@@ -1,6 +1,10 @@
 using Furion;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Schema;
+using Yi.Framework.Infrastructure.Data;
+using Yi.Framework.Infrastructure.Data.DataSeeds;
 using Yi.Framework.Infrastructure.Sqlsugar;
 
 namespace Yi.Furion.Sqlsugar.Core;
@@ -11,4 +15,11 @@ public class Startup : AppStartup
     {
         services.AddDbSqlsugarContextServer<YiDbContext>();
     }
+    public async void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        app.UseDataFiterServer();
+        app.UseSqlsugarCodeFirstServer();
+        await app.UseDataSeedServer();
+    }
+
 }
diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs
index 2c20b346..bded8a46 100644
--- a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs
@@ -69,10 +69,19 @@ public class Startup : AppStartup
         app.UseAuthorization();
 
         app.UseInject(string.Empty);
+      
+    }
+}
+
+[AppStartup(-1)]
+public class EndStartup : AppStartup
+{
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
         app.UseEndpoints(endpoints =>
         {
             endpoints.MapHub<OnlineUserHub>("/api/hub/main");
             endpoints.MapControllers();
         });
     }
-}
+}
\ No newline at end of file
diff --git a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
index 7fd8df6d..58f7d112 100644
--- a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
@@ -145,7 +145,7 @@ function resetQuery() {
 }
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  userIds.value = selection.map(item => item.userId);
+  userIds.value = selection.map(item => item.id);
   multiple.value = !selection.length;
 }
 /** 打开授权用户表弹窗 */
@@ -164,7 +164,7 @@ function cancelAuthUser(row) {
 /** 批量取消授权按钮操作 */
 function cancelAuthUserAll(row) {
   const roleId = queryParams.roleId;
-  const uIds = userIds.value.join(",");
+  const uIds = userIds.value;
   proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {
     return authUserCancelAll({ roleId: roleId, userIds: uIds });
   }).then(() => {
diff --git a/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue b/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
index 8035ec93..c300e0c8 100644
--- a/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
@@ -118,14 +118,16 @@ const emit = defineEmits(["ok"]);
 /** 选择授权用户操作 */
 function handleSelectUser() {
   const roleId = queryParams.roleId;
-  const uIds = userIds.value.join(",");
-  if (uIds == "") {
+
+  const uIds = userIds.value;
+  if (uIds == []) {
     proxy.$modal.msgError("请选择要分配的用户");
     return;
   }
-  authUserSelectAll({ roleId: roleId, userIds: [uIds] }).then(res => {
-    proxy.$modal.msgSuccess("成功");
-    if (res.code === 200) {
+  
+  authUserSelectAll({ roleId: roleId, userIds:uIds }).then(res => {
+    if (res.statusCode == 200) {
+      proxy.$modal.msgSuccess("成功");
       visible.value = false;
       emit("ok");
     }