From fcf94ce98284350d1af646de6b31f79d2da709f4 Mon Sep 17 00:00:00 2001
From: tengyufan <1532636164@qq.com>
Date: Tue, 11 Aug 2026 14:35:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E9=9D=9E=E5=9B=BD?=
 =?UTF-8?q?=E8=81=94=E5=AE=A2=E6=88=B7=E5=AE=A1=E6=89=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YLErpDAL/Modules/ClientModule/ClientDutyService.cs   | 8 ++++----
 YLErpDAL/Modules/ClientModule/ClientFileService.cs   | 2 +-
 YLErpDAL/Modules/ClientModule/ClientImportService.cs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/YLErpDAL/Modules/ClientModule/ClientDutyService.cs b/YLErpDAL/Modules/ClientModule/ClientDutyService.cs
index e2087d0d..c72fbc56 100644
--- a/YLErpDAL/Modules/ClientModule/ClientDutyService.cs
+++ b/YLErpDAL/Modules/ClientModule/ClientDutyService.cs
@@ -98,7 +98,7 @@ namespace YLErp.Modules.ClientModule
                     //针对法人，授权协议签署人才做唯一性判断,有效期结束后可新增
                     if ((contactType == contactypelist.FirstOrDefault(x => x.ContactType == "法人")?.id || (contactType == contactypelist.FirstOrDefault(x => x.ContactType == "授权协议签署人")?.id && PS.Config.Company == Configuration.CompanyEnum.国泰君安))
                         && DbContext.clientduty.Any(x => x.ApprovalOrder < 1 && x.ClientId == req.ClientId && x.ContactTypeId.Contains(contactType.ToString()) && (x.DeadLine >= DateTime.Now || !x.DeadLine.HasValue))
-                        && !PS.Config.Is浙期 && PS.Config.Company != Configuration.CompanyEnum.国联)
+                        && PS.Config.Company != Configuration.CompanyEnum.国联)
                     {
                         throw new ServiceException("法人在有效期内必须唯一，授权协议签署人必须唯一");
                     }
@@ -113,7 +113,7 @@ namespace YLErp.Modules.ClientModule
                     //针对法人，授权协议签署人才做唯一性判断，有效期结束后可新增
                     if ((contactType == contactypelist.FirstOrDefault(x => x.ContactType == "法人")?.id || contactType == contactypelist.FirstOrDefault(x => x.ContactType == "授权协议签署人")?.id)
                         && DbContext.clientduty.Any(x => x.ApprovalOrder < 1 && x.ClientId == req.ClientId && x.ContactTypeId.Contains(contactType.ToString()) && x.id != req.id && (x.DeadLine >= DateTime.Now || !x.DeadLine.HasValue))
-                        && !PS.Config.Is浙期 && PS.Config.Company != Configuration.CompanyEnum.国联)
+                        && PS.Config.Company != Configuration.CompanyEnum.国联)
                     {
                         throw new ServiceException("法人在有效期内必须唯一，授权协议签署人必须唯一");
                     }
@@ -209,7 +209,7 @@ namespace YLErp.Modules.ClientModule
             if (dbmodel.ApprovalOrder == 0)
             {
                 if (clientCount > 0 && client.ProcessStatus == "已开户"
-                    && (PS.Config.Is浙期 || PS.Config.Company == Configuration.CompanyEnum.国联))
+                    && PS.Config.Company == Configuration.CompanyEnum.国联)
                 {
                     if (!isAdd)
                     {
@@ -399,7 +399,7 @@ namespace YLErp.Modules.ClientModule
             var clientCount = yldb.approvalprocess.Where(x => x.processType == "ClientProcess").Count();
 
             if (clientCount > 0 && client.ProcessStatus == "已开户"
-                && (PS.Config.Is浙期 || PS.Config.Company == Configuration.CompanyEnum.国联)
+                && PS.Config.Company == Configuration.CompanyEnum.国联
                 && clientDuty.ApprovalOrder == 0)
             {
                 clientDuty.ApprovalOrder = (int)ApprovalOrderEnum.删除;
diff --git a/YLErpDAL/Modules/ClientModule/ClientFileService.cs b/YLErpDAL/Modules/ClientModule/ClientFileService.cs
index 7999e682..6b6a6a24 100644
--- a/YLErpDAL/Modules/ClientModule/ClientFileService.cs
+++ b/YLErpDAL/Modules/ClientModule/ClientFileService.cs
@@ -1103,7 +1103,7 @@ namespace YLErp.Modules.ClientModule
         public bool resetClientProcess(client_file file, ApprovalOrderEnum orderEnum)
         {
             if (string.IsNullOrWhiteSpace(file.ProtocolNumber) && file.ApprovalOrder == (int)ApprovalOrderEnum.无需审批
-                && !PS.Config.Is浙期 && PS.Config.Company != Configuration.CompanyEnum.国联)
+                && PS.Config.Company != Configuration.CompanyEnum.国联)
             {
                 return false;
             }
diff --git a/YLErpDAL/Modules/ClientModule/ClientImportService.cs b/YLErpDAL/Modules/ClientModule/ClientImportService.cs
index 62537337..4914a9c2 100644
--- a/YLErpDAL/Modules/ClientModule/ClientImportService.cs
+++ b/YLErpDAL/Modules/ClientModule/ClientImportService.cs
@@ -1778,7 +1778,7 @@ namespace YLErp.Modules.ClientModule
                 var processlist = yldb.approvalprocess.Where(x => x.processType == "ClientProcess");
 
                 if (processlist.Count() > 0 && client.ProcessStatus == "已开户"
-                    && (PS.Config.Is浙期 || PS.Config.Company == Configuration.CompanyEnum.国联))
+                    && PS.Config.Company == Configuration.CompanyEnum.国联)
                 {
                     clientDuty.ApprovalOrder = (int)ApprovalOrderEnum.导入;