From 9b8acdb47720b95bcf02b79dbc59030fde6d8f02 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 23 Feb 2024 17:04:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic/Device/Response/DeviceResponse.cs | 3 +++ Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs index d28b8650..642a250a 100644 --- a/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs +++ b/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs @@ -88,6 +88,9 @@ public class DeviceResponse } } + public DeviceTypeEnumType Type { get; set; } + public string TypeDesc => Type.GetDescription(); + /// /// 连接信息 /// diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 3db17c09..aeafde5a 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -236,7 +236,7 @@ public class DeviceService : IDeviceService }, true) .ToListAsync(); - return devices.Where(x => x.Funcs.Contains(DeviceFuncEnumType.Attendance)).ToList(); + return devices.Where(x => x.Type == DeviceTypeEnumType.Attendance).ToList(); } public async Task GetDeviceNumberAsync()