From 42ed53cdaa53ba5eb1c4897a2d2c7db7a57f9f13 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 11 Jul 2024 10:46:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=A6=BB=E8=81=8C=E5=B0=B1=E9=A4=90?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Organization/Services/Implements/GainfoMealService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs index 0e62de89..e4c5b33e 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoMealService.cs @@ -38,7 +38,7 @@ public class GainfoMealService : IGainfoMealService || gainfo.Name.Contains(request.Search) || gainfoLeave.Name.Contains(request.Search)) .Where((meal, gainfo, gainfoLeave) => gainfo.Factory == tenantId || gainfoLeave.Factory == tenantId) - .WhereIF(request.IsLeave, (meal, gainfo, gainfoLeave) => SqlFunc.IsNullOrEmpty(gainfo.No)) + .WhereIF(request.IsLeave, (meal, gainfo, gainfoLeave) => SqlFunc.Subqueryable().Where(x => x.Code == meal.UserCode).Any()) .Select((meal, gainfo, gainfoLeave, dept1, dept2) => new GainfoMealResponse { Balance = meal.Balance, @@ -122,7 +122,7 @@ public class GainfoMealService : IGainfoMealService .SetColumns(x => x.Version == x.Version + 1) .Where(x => x.UserCode == request.BeforeCode) //不需要判断version .ExecuteCommandAsync(); - + //转移到现有人员 var gainfo = await _dbContext.Queryable().Where(x => x.Code == request.NowCode).SingleAsync(); gainfo.ThrowIfNull("目标人员不存在");