!1534 代码优化

Merge pull request !1534 from 喵你个汪/next

Admin.NET/Admin.NET.Core/Service/Appliication/SysAppService.cs → Admin.NET/Admin.NET.Core/Service/Application/SysAppService.cs

@@ -141,18 +141,23 @@ public class SysAppService : IDynamicApiController, ITransient
     public async Task<dynamic> GetChangeAppData()
     {
         var list = await _sysAppRep.AsQueryable().Includes(u => u.TenantList).ToListAsync();
-        return list.Where(u => u.TenantList.Count > 0).Select(u => new
+        return new
         {
-            u.Id,
-            Value = u.Id,
-            Label = u.Name,
-            Children = u.TenantList.Select(t => new
+            _userManager.AppId,
+            _userManager.TenantId,
+            SelectList = list.Where(u => u.TenantList.Count > 0).Select(u => new
             {
-                t.Id,
-                Value = t.Id,
-                Label = t.Host ?? (t.Id + ""),
+                u.Id,
+                Value = u.Id,
+                Label = u.Name,
+                Children = u.TenantList.Select(t => new
+                {
+                    t.Id,
+                    Value = t.Id,
+                    Label = t.Host ?? (t.Id + ""),
+                })
             })
-        });
+        };
     }
     
     /// <summary>

Web/src/layout/navBars/topBar/changeApp.vue

@@ -53,7 +53,14 @@ const state = reactive({
 
 // 打开弹窗
 const openDialog = async () => {
-  if (state.appList.length == 0) state.appList = await getAPI(SysAppApi).apiSysAppChangeAppGet().then(res => res.data.result ?? []);
+  if (state.appList.length == 0) {
+    const result = await getAPI(SysAppApi).apiSysAppChangeAppGet().then(res => res.data.result);
+    state.appList = result?.selectList ?? [];
+    state.tenantList = state.appList.find((u: any) => u.id === result?.appId)?.children ?? [];
+
+    state.ruleForm.tenantId = result?.tenantId;
+    state.ruleForm.id = result?.appId;
+  }
   ruleFormRef.value?.resetFields();
   state.isShowDialog = true;
   state.loading = false;