From 3f5b4b159cde1ed8254c807ecc07b9d66302bfb9 Mon Sep 17 00:00:00 2001
From: suncaomei <s@caomei.in>
Date: Thu, 20 Feb 2025 01:30:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/OnlineUser/SysOnlineUserService.cs              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs b/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
index d2068f89..44a3da5b 100644
--- a/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
@@ -119,14 +119,16 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
         if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysSingleLogin)) return;
 
         // 相同账号最后登录的用户Id集合
-        var onlineUserIds = await _sysOnlineUerRep.AsQueryable().GroupBy(u => u.UserId)
+        var onlineUserRecords = await _sysOnlineUerRep.AsQueryable()
+            .GroupBy(u => u.UserId)
             .Select(u => new
             {
                 UserId = u.UserId,
                 Count = SqlFunc.AggregateCount(u.UserId),
                 Id = SqlFunc.AggregateMax(u.Id)
             })
-            .ToListAsync(u => u.Id);
+            .ToListAsync();
+        var onlineUserIds = onlineUserRecords.Select(x => x.Id).ToList();
 
         // 无效登录用户集合
         var offlineUsers = await _sysOnlineUerRep.AsQueryable().Where(u => !onlineUserIds.Contains(u.Id)).ToListAsync();

From f8a1ae41f85dc496d8b2a250919a0934d2af5dbc Mon Sep 17 00:00:00 2001
From: suncaomei <s@caomei.in>
Date: Thu, 27 Feb 2025 13:09:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dedit=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/template/web_views_editDialog.vue.vm              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
index 80f207a8..d131a524 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
@@ -91,7 +91,7 @@
 					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						@:<el-form-item label="@column.ColumnComment" prop="@(@column.LowerPropertyName)">
 							@:<el-select clearable v-model="state.ruleForm.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
-								@:<el-option v-for="(item,index) in dl('@(@column.DictTypeCode)')"  :key="index" :value="@(@column.NetType.StartsWith("string") ? "item.code" : "Number(item.value)")" :label="`${item.name||''} [${item.code}] ${item.value}`"></el-option>
+								@:<el-option v-for="(item,index) in dl('@(@column.DictTypeCode)')"  :key="index" :value="@(@column.NetType.StartsWith("string") ? "item.code" : "Number(item.value)")" :label="`${item.label||''} [${item.code}] ${item.value}`"></el-option>
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -142,7 +142,7 @@
 					@:<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						@:<el-form-item label="@column.ColumnComment" prop="@(@column.LowerPropertyName)">
 							@:<el-select clearable v-model="state.ruleForm.@(@column.LowerPropertyName)" placeholder="请选择@(@column.ColumnComment)">
-								@:<el-option v-for="(item,index) in dl('@(@column.DictTypeCode)')" :key="index" :value="@(@column.NetType.StartsWith("string") ? "item.value" : "Number(item.value)")" :label="`${item.name||''} (${item.code}) [${item.value}]`"></el-option>
+								@:<el-option v-for="(item,index) in dl('@(@column.DictTypeCode)')" :key="index" :value="@(@column.NetType.StartsWith("string") ? "item.value" : "Number(item.value)")" :label="`${item.label||''} (${item.code}) [${item.value}]`"></el-option>
 							</el-select>
 						</el-form-item>
 					</el-col>