diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 6605c545..7e823caf 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -14,6 +14,7 @@ using Kurisu.AspNetCore.Utils.Extensions; using Mapster; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using SqlSugar; namespace Dlhis.Basic.Device.Services.Implements; @@ -41,7 +42,7 @@ public class DeviceService : IDeviceService .Where((d, dt) => d.Type == request.Type) .WhereIF(request.Enable.HasValue, (d, dt) => d.Enable == request.Enable) .WhereIF(request.Search.IsPresent(), d => d.UniqueNo == request.Search || d.DeployPlace.Contains(request.Search)) - .WhereIF(request.Supplier.IsPresent(), d => d.Supplier.Contains(request.Search)) + .WhereIF(request.Supplier.IsPresent(), d => !SqlFunc.IsNullOrEmpty(request.Search) && d.Supplier.Contains(request.Supplier)) .Select((d, dt, dr, bp) => new DevicePageResponse { FuncsStr = d.Funcs.ToString(),