From 7c0fa747673ea7f2d8ac1a760247b3ee976b76da Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 23 Feb 2024 12:22:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/BusinessPlaceShiftService.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index 941378eb..aa3f2905 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -11,7 +11,6 @@ using Kurisu.SqlSugar.Attributes; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using Mapster; -using Org.BouncyCastle.Asn1.Ocsp; namespace Dlhis.Basic.BusinessShift.Services.Implements; @@ -111,11 +110,19 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService }; } + var tenantResult = await _tenantApi.GetTenantByCodeAsync(place.TenantId); + (tenantResult.Code == ApiStateCode.Success).ThrowIfFalse(tenantResult.Msg); + var tenantInfo = tenantResult.Data; + var relationship = await _dbContext.Queryable().Where(x => x.PlaceCode == place.Code).FirstAsync(); if (relationship == null) { return new BusinessPlaceWithShiftResponse() { + CustomCode = placeCustomCode, + Name = place.Name, + TenantCode = tenantInfo.Code, + TenantName = tenantInfo.Name, Shifts = new List() }; } @@ -125,10 +132,6 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService .OrderBy(x => x.Sequence) //排序 .ToListAsync(); - var tenantResult = await _tenantApi.GetTenantByCodeAsync(place.TenantId); - (tenantResult.Code == ApiStateCode.Success).ThrowIfFalse(tenantResult.Msg); - var tenantInfo = tenantResult.Data; - var list = new List(); foreach (BusinessShiftMealRelationshipEntity shiftinfo in shifts) {