From 1ca613a0962da70b8214a8f5e41cf04c05243924 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 7 Feb 2025 16:51:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8E=92=E9=99=A4=E5=87=BA=E5=B7=AE?= =?UTF-8?q?=E5=88=B0=E6=9C=AC=E5=9F=BA=E5=9C=B0=E7=9A=84=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/SapBusinessTripService.cs | 6 +++++- Src/Dlhis.Jip.Api/Responses/SapBusinessTripInfoResponse.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/SapBusinessTripService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/SapBusinessTripService.cs index 2aeb6b73..7460cf1a 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/SapBusinessTripService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/SapBusinessTripService.cs @@ -80,7 +80,11 @@ public class SapBusinessTripService : ISapBusinessTripService if (deviceCodes.Any()) { var userCodes = tripInfos.Select(x => x.Code).Distinct().ToList(); - var gainfos = await _dbContext.Queryable().Where(x => userCodes.Contains(x.Code)).Select(x => new { x.No, x.Code }).ToListAsync(); + var gainfos = await _dbContext.Queryable() + .Where(x => x.Factory != factory) //排除本基地出差 + .Where(x => userCodes.Contains(x.Code)) + .Select(x => new { x.No, x.Code }) + .ToListAsync(); foreach (var gainfo in gainfos) { diff --git a/Src/Dlhis.Jip.Api/Responses/SapBusinessTripInfoResponse.cs b/Src/Dlhis.Jip.Api/Responses/SapBusinessTripInfoResponse.cs index 9aed5c9a..486dc268 100644 --- a/Src/Dlhis.Jip.Api/Responses/SapBusinessTripInfoResponse.cs +++ b/Src/Dlhis.Jip.Api/Responses/SapBusinessTripInfoResponse.cs @@ -74,7 +74,7 @@ public class SapBusinessTripInfoItem public double Day { get; set; } /// - /// 出差目的地 + /// 出差目的地(factory) /// [JsonProperty("OV_CCMDD")] public string Destination { get; set; }