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,