From 8cc3bff6979c8e3d66e9d4caa91398c3f0e58f0a Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 12 九月 2025 15:09:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob
---
FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs | 15 +++++++++++----
FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml | 2 +-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs b/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs
index 246cb00..67d6b7f 100644
--- a/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/ElectronSign/Queries/ContractTemplateQueryHandler.cs
@@ -21,7 +21,8 @@
IRepository<ContractTemplate> rep,
IRepository<Enterprise> repEnterprise,
IRepository<User> repUser,
- IRepository<DbAuditLog, LogDbContextLocator> repDbAuditLog
+ IRepository<DbAuditLog, LogDbContextLocator> repDbAuditLog,
+ IRepository<EnterpriseElectronSignSetting> repEnterpriseElectronSignSetting
) :
IRequestHandler<GetContractTemplateEnterprisesQuery, GetContractTemplateEnterprisesQueryResult>,
IRequestHandler<GetEnterpriseContractTemplatesQuery, GetEnterpriseContractTemplatesQueryResult>,
@@ -33,6 +34,7 @@
private readonly IRepository<Enterprise> repEnterprise = repEnterprise;
private readonly IRepository<User> repUser = repUser;
private readonly IRepository<DbAuditLog, LogDbContextLocator> repDbAuditLog = repDbAuditLog;
+ private readonly IRepository<EnterpriseElectronSignSetting> repEnterpriseElectronSignSetting = repEnterpriseElectronSignSetting;
/// <summary>
/// 鏌ヨ杩愯惀绔崗璁鐞嗗垪琛�
@@ -225,13 +227,18 @@
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public Task<List<SelectOption<Guid, GetEnterpriseContractTemplateSelectQueryOption>>> Handle(GetEnterpriseContractTemplateSelectQuery request, CancellationToken cancellationToken)
+ public async Task<List<SelectOption<Guid, GetEnterpriseContractTemplateSelectQueryOption>>> Handle(GetEnterpriseContractTemplateSelectQuery request, CancellationToken cancellationToken)
{
var logier = JwtUtils.GetCurrentLogier();
- return request.GetSelect<ContractTemplate, Guid, GetEnterpriseContractTemplateSelectQueryOption>(
+
+ var accesses = await repEnterpriseElectronSignSetting.AsQueryable()
+ .Where(it => it.EnterpriseId == logier.EnterpriseId)
+ .Select(it => it.ElectronSignAccess)
+ .ToListAsync();
+ return await request.GetSelect<ContractTemplate, Guid, GetEnterpriseContractTemplateSelectQueryOption>(
it => it.Id,
it => it.Name,
- q => q.Where(it => it.EnterpriseId == logier.EnterpriseId && !it.IsDisabled),
+ q => q.Where(it => it.EnterpriseId == logier.EnterpriseId && !it.IsDisabled && it.Status== EnumContractTemplateStatus.Completed && it.Access.HasValue && accesses.Contains(it.Access.Value)),
cancellationToken);
}
diff --git a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
index 7278d9d..5c2f1f3 100644
--- a/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
+++ b/FlexJobApi.UserServer.Application/FlexJobApi.UserServer.Application.xml
@@ -288,7 +288,7 @@
鍚堝悓妯℃澘鏌ヨ澶勭悊鍣�
</summary>
</member>
- <member name="M:FlexJobApi.UserServer.Application.ContractTemplateQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.ContractTemplate},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.Enterprise},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.User},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.DbAuditLog,FlexJobApi.Core.LogDbContextLocator})">
+ <member name="M:FlexJobApi.UserServer.Application.ContractTemplateQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.ContractTemplate},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.Enterprise},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.User},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.DbAuditLog,FlexJobApi.Core.LogDbContextLocator},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.EnterpriseElectronSignSetting})">
<summary>
鍚堝悓妯℃澘鏌ヨ澶勭悊鍣�
</summary>
--
Gitblit v1.9.1