From ba7821796b9aa505b21c23d169367b47c4883e81 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 15 Jul 2024 10:52:01 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9Afactory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Device/Services/Implements/DeviceConnectService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs index 9a49852a..4b767cc6 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs @@ -54,7 +54,6 @@ public class DeviceConnectService : IDeviceConnectService await _dbContext.InsertAsync(registry); return "设备注册成功"; - } public async Task> GetNotSetBusinessPlaceDevicesAsync() @@ -129,9 +128,11 @@ public class DeviceConnectService : IDeviceConnectService public async Task> GetDeviceUniqueInfoByBrandAsync(string brand, string factory) { + var factories = factory.Split(",").ToList(); + return await _dbContext.Queryable() .LeftJoin((d, dt) => d.TemplateCode == dt.Code) - .Where((d, dt) => dt.Brand == brand && d.TenantId == factory) + .Where((d, dt) => dt.Brand == brand && factories.Contains(d.TenantId)) .Select(d => new DeviceUniqueWithConnectionInfoDto { DeviceUnique = d.UniqueNo,