From 59afa0eaecc1daf07128aa2fd02df238c9854d4c Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 16:23:17 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 8bb400a..b46711c 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -49,6 +49,14 @@
{
q = q.Where(it => it.EnterpriseId == logier.EnterpriseId);
}
+ if (request.Keywords.IsNotNull())
+ {
+ q = q.Where(it =>
+ it.TaskInfoUsers.Any(tu =>
+ tu.EnterpriseEmployee.User.Name.Contains(request.Keywords)
+ || tu.EnterpriseEmployee.User.PhoneNumber.Contains(request.Keywords)
+ || tu.EnterpriseEmployee.User.Identity.Contains(request.Keywords)));
+ }
if (logier.ClientType == EnumClientType.Wxmp)
{
if (request.CheckReceiveStatus == null)
@@ -60,8 +68,9 @@
throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鏃ユ湡");
}
q = q.Where(it =>
- it.TaskInfoUsers.Any(tu =>
- tu.EnterpriseEmployee.UserId == logier.Id
+ (logier.Type == EnumUserType.Enterprise ? it.EnterpriseId == logier.EnterpriseId : true)
+ && it.TaskInfoUsers.Any(tu =>
+ (logier.Type == EnumUserType.Personal ? tu.EnterpriseEmployee.UserId == logier.Id : true)
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
? !tu.Submits.Any(s => s.Date.Date == request.Date.Value.Date)
: tu.Submits.Any(s =>
@@ -156,6 +165,8 @@
result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
.Where(it => it.Id == request.Id)
.GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+ result.ObjectData.EnterpriseEmployeeUser.IsBindBankCard = await repTaskInfo.Change<UserBankCard>().AsQueryable().AsNoTracking()
+ .AnyAsync(it => it.UserId == result.ObjectData.EnterpriseEmployeeUser.Id);
return result;
}
--
Gitblit v1.9.1