From f84dee5716c052c8c2b43a3dc8ee43e6a0f387a9 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 8 Apr 2025 14:16:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/WorkGridService.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs index 6bf918ce..6c05e6a8 100644 --- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs +++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs @@ -147,12 +147,16 @@ public class WorkGridService : IWorkGridService .LeftJoin((x, ga) => x.LeaderUserCode == ga.Code) .WhereIF(!isAll, x => x.LeaderUserCode == userCode) .WhereIF(request.Search.IsPresent(), x => x.Name.Contains(request.Search) || x.LeaderUserCode == request.Search) - .Where(x => SqlFunc.Subqueryable() - .LeftJoin((p, pga) => p.UserCode == pga.Code) - .Where(p => p.WorkGridCode == x.Code) - .Where((p, pga) => pga.Factory == factory) - .Where(p => p.IsDeleted == false) - .Any() + .Where(x => SqlFunc.Subqueryable() + .Where(p => p.Code == x.LeaderUserCode && p.Factory == factory) + .Any() + || + SqlFunc.Subqueryable() + .LeftJoin((p, pga) => p.UserCode == pga.Code) + .Where(p => p.WorkGridCode == x.Code) + .Where((p, pga) => pga.Factory == factory) + .Where(p => p.IsDeleted == false) + .Any() ) .Select((x, ga) => new WorkGridPageResponse {