修改相关bug

2026-09-17 11:37:39 +08:00
parent e9894538e8
commit 9de05b44b8
17 changed files with 171 additions and 30 deletions
@@ -153,13 +153,14 @@ public class OnboardingContractDocumentService : IOnboardingContractDocumentServ
        var versions = await _db.Queryable<ObContractTemplateVersion>()
            .Where(item => versionIds.Contains(item.Id))
            .ToListAsync();
+        var now = DateTime.Now;
        var versionsValid = versions.Count == versionIds.Count
                            && contractConfigs.All(config => versions.Any(version =>
                                version.Id == config.ContractTemplateVersionId
                                && version.TemplateId == config.ContractTemplateId
-                                && version.VersionStatus == ContractTemplateVersionStatus.Enabled));
+                                && ContractTemplateVersionValidity.IsAvailable(version, now)));
        if (!versionsValid)
-            throw Oops.Bah("入职模板包含不存在、未启用或归属错误的合同版本");
+            throw Oops.Bah("入职模板包含不存在、未生效、已失效、未启用或归属错误的签署材料版本");

        var inputs = input.ContractVariables
                     ?? new List<OnboardingInitialContractVariableInput>();