From 5a7938c9661ac689a70e7d6320e347e6b8d98b20 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 21 Mar 2025 10:04:17 +0800 Subject: [PATCH] fix isDeleted --- .../WorkGrids/Services/Implements/WorkGridScheduleService.cs | 2 +- .../WorkGrids/Services/Implements/WorkGridService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs index 326ed715..95d40067 100644 --- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs +++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridScheduleService.cs @@ -180,7 +180,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService .WhereIF(request.DateTimePeriod.HasValue(), log => log.RaiseDateTime >= request.DateTimePeriod.Start && log.RaiseDateTime <= request.DateTimePeriod.End) .WhereIF(request.UserCode.IsPresent(), log => log.UserUniqueNo == request.UserCode) - .WhereIF(request.UserCode.IsEmpty(), log => SqlFunc.Subqueryable().Where(p => p.WorkGridCode == workGrid.Code && p.UserCode == log.UserUniqueNo).Any()) + .WhereIF(request.UserCode.IsEmpty(), log => SqlFunc.Subqueryable().Where(p => p.WorkGridCode == workGrid.Code && p.UserCode == log.UserUniqueNo && p.IsDeleted == false).Any()) .Where(log => log.WorkGridInfo.StartsWith(filterString)) .Where((log, d) => d.Type == DeviceTypeEnumType.Attendance || (d.Type == DeviceTypeEnumType.Door && d.AsAttendance)) .OrderBy(log => log.RaiseDateTime) diff --git a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs index 41286d8f..66313001 100644 --- a/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs +++ b/Src/Dlhis.Basic/WorkGrids/Services/Implements/WorkGridService.cs @@ -146,7 +146,7 @@ public class WorkGridService : IWorkGridService LeaderUserCode = x.LeaderUserCode, UserName = ga.Name, Remark = x.Remark, - UserCount = SqlFunc.Subqueryable().Where(p => p.WorkGridCode == x.Code).Count() + UserCount = SqlFunc.Subqueryable().Where(p => p.WorkGridCode == x.Code && x.IsDeleted == false).Count() }) .ToPageListAsync(request); } @@ -259,7 +259,7 @@ public class WorkGridService : IWorkGridService var role = _currentUser.GetRole(); var specific = (role is "admin" or "tenant-admin" or "WGZGLY") && request.WorkGridCode.HasValue; var currentUserCode = _currentUser.GetUserClaim(UserClaimConstants.JinkoCode); - + var myWorkGrid = await _dbContext.Queryable() .WhereIF(specific, x => x.Code == request.WorkGridCode) .WhereIF(specific == false, x => x.LeaderUserCode == currentUserCode)