From 62c43ab14686cd7c5e5d5749145a74c53264428d Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Wed, 6 Mar 2024 19:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=98=8E=E7=BB=86=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=88=A0=E9=99=A4=E5=92=8C=E5=AF=B9=E5=A4=96=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 10 ++++++++-- .../Repositories/TrackContentRepository.cs | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 1c37f744..908d7227 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -53,7 +53,7 @@ namespace SJZY.Track.Application.Services.TrackOrders TrackTemplateIds = input.TrackTemplateIds, TrackCodes=trackCodes }); - + input.TrackTemplateIds =input.TrackTemplateIds.Where(a => a>0).ToList(); int id = 1; list.ForEach(a => { @@ -61,7 +61,13 @@ namespace SJZY.Track.Application.Services.TrackOrders var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId==input.SubSystemId && b.TrackCode==a.Code && input.TrackTemplateIds.Contains(b.TrackTemplateId)); - var trackContent = trackContentsOfTemplates.FirstOrDefault(); + GetTemplateContentAttributeValueVO trackContent = null; + var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); + if (!insertData.IsNullOrEmpty()) + { + trackContent =trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId==insertData.FirstOrDefault()); + } + if (trackContent!=null) { a.IsCanDelete=trackContent.IsCanDelete; diff --git a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs index 72cf57ba..7609c5a6 100644 --- a/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs @@ -103,6 +103,7 @@ public class TrackContentRepository : BasicRepository, ITrac .WhereIF(input.SubSystemId>0, (a, b, c) => a.SubSystemId==input.SubSystemId) .WhereIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => input.TrackTemplateIds.Contains(c.Id)) .Where((a, b, c) => c.Id>0) + //.OrderByIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => SqlFunc.IIF(input.TrackTemplateIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), c.CreateTime), OrderByType.Desc) .Select((a, b, c) => new GetTemplateContentAttributeValueVO { IsCanDelete=b.IsCanDelete,