From 185eca1406926d46fa9f50d07a0c0ecc65ab6b96 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 01 九月 2025 11:12:17 +0800
Subject: [PATCH] feat:开发

---
 FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
index f028764..136ea3f 100644
--- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs
@@ -65,26 +65,30 @@
             {
                 q = q.Where(it => (it.UserId.HasValue && it.User.IsReal) == request.IsReal.Value);
             }
-            if (request.UserSignContractStatus.HasValue && logier.ClientType == EnumClientType.Wxmp)
+            if (request.UserSignContractStatus.HasValue)
             {
-                switch (request.UserSignContractStatus.Value)
+                if (logier.ClientType == EnumClientType.Wxmp)
                 {
-                    case EnumTaskUserSignContractStatus.Wait:
-                        q = q.Where(it => it.UserSignContractStatus == null || it.UserSignContractStatus == request.UserSignContractStatus);
-                        break;
-                    case EnumTaskUserSignContractStatus.Pass:
-                        q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
-                        break;
-                    case EnumTaskUserSignContractStatus.Stop:
-                        q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
-                        break;
-                    default:
-                        break;
+                    switch (request.UserSignContractStatus.Value)
+                    {
+                        case EnumTaskUserSignContractStatus.Wait:
+                            q = q.Where(it => it.UserSignContractStatus == null || it.UserSignContractStatus == request.UserSignContractStatus);
+                            break;
+                        case EnumTaskUserSignContractStatus.Pass:
+                            q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus && it.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass);
+                            break;
+                        case EnumTaskUserSignContractStatus.Stop:
+                            q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+                            break;
+                        default:
+                            q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+                            break;
+                    }
                 }
-            }
-            else
-            {
-                q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+                else
+                {
+                    q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus);
+                }
             }
             if (request.EnterpriseSignContractStatus.HasValue)
             {
@@ -116,13 +120,14 @@
                 UserSignContractStatus = it.UserSignContractStatus,
                 HireTime = it.TaskInfoUsers
                     .OrderBy(tu => tu.HireTime)
-                    .Where(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass && tu.HireTime.HasValue)
+                    .Where(tu => tu.HireTime.HasValue)
                     .Select(tu => tu.HireTime)
                     .FirstOrDefault(),
                 UserRealTime = it.User.RealTime,
                 UserSignContractTime = it.UserSignContractTime,
                 EnterpriseSignContractStatus = it.EnterpriseSignContractStatus,
-                EnterpriseSignContractTime = it.EnterpriseSignContractTime
+                EnterpriseSignContractTime = it.EnterpriseSignContractTime,
+                ContractUrl = it.ContractUrl,
             });
             return await request.PageModel.GetPagedListAsync<GetEnterpriseEmployeesQueryResult, GetEnterpriseEmployeesQueryResultItem>(s, cancellationToken);
         }

--
Gitblit v1.9.1