From e69dca6180daf0028ce71edb6bc04da7b5bf7443 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 9 Jun 2025 10:13:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=94=AF=E6=8C=81=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs | 2 ++ Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs b/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs index 9f15d865..6d0894d7 100644 --- a/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs +++ b/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs @@ -17,6 +17,8 @@ public class DevicePageRequest : PageDto [EnumDataType(typeof(DeviceTypeEnumType))] public DeviceTypeEnumType Type { get; set; } + public string Supplier { get; set; } + /// /// 启用状态 /// diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 22e8fd5e..6605c545 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -41,6 +41,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)) .Select((d, dt, dr, bp) => new DevicePageResponse { FuncsStr = d.Funcs.ToString(),