From 57837cfe1d1e8a19672eb1cbfb666ebe1ea57233 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 31 May 2024 11:03:13 +0800
Subject: [PATCH] =?UTF-8?q?CRO=20=20Sponsor=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml         | 6 +++---
 IRaCIS.Core.Application/Service/Institution/CROService.cs   | 2 +-
 .../Service/Institution/SponsorService.cs                   | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 30c0af574..99b2b7447 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1170,7 +1170,7 @@
             <param name="currentInspectionId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetDataInspectionDateType(System.Collections.Generic.List{System.String},System.String)">
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetDataInspectionDateType(System.Collections.Generic.List{System.String},System.String,System.String)">
             <summary>
             格式化日期和时间
             </summary>
@@ -1178,7 +1178,7 @@
             <param name="jsonStr"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.GetInspectionEnumValue(System.Collections.Generic.List{System.String},System.String)">
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.GetInspectionEnumValue(System.Collections.Generic.List{System.String},System.String,System.String)">
             <summary>
             获取外键表数据
             </summary>
@@ -1186,7 +1186,7 @@
             <param name="jsonStr"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetEnum(System.Guid,System.Collections.Generic.List{System.String},System.String)">
+        <member name="M:IRaCIS.Core.Application.Service.FrontAuditConfigService.SetEnum(System.Guid,System.Collections.Generic.List{System.String},System.String,System.String)">
             <summary>
             获取枚举
             </summary>
diff --git a/IRaCIS.Core.Application/Service/Institution/CROService.cs b/IRaCIS.Core.Application/Service/Institution/CROService.cs
index 202811966..7dc21e2a3 100644
--- a/IRaCIS.Core.Application/Service/Institution/CROService.cs
+++ b/IRaCIS.Core.Application/Service/Institution/CROService.cs
@@ -47,7 +47,7 @@ namespace IRaCIS.Application.Services
 
             var exp = new EntityVerifyExp<CRO>()
             {
-                VerifyExp = cro => cro.CROName.Equals(addCroCompanyCommand.CROName),
+                VerifyExp = cro =>( cro.CROName.Equals(addCroCompanyCommand.CROName) || cro.CRONameCN.Equals(addCroCompanyCommand.CRONameCN)) && cro.IsTrialLevel==false,
                 //---已经存在同名的CRO，请确认。
                 VerifyMsg = _localizer["CRO_DupName"]
             };
diff --git a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
index 41412edec..b81e43fa9 100644
--- a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
+++ b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
@@ -2,6 +2,7 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Infra.EFCore;
 using Microsoft.AspNetCore.Mvc;
+using IRaCIS.Core.Domain.Models;
 
 namespace IRaCIS.Application.Services
 {
@@ -45,7 +46,7 @@ namespace IRaCIS.Application.Services
         {
             var exp = new EntityVerifyExp<Sponsor>()
             {
-                VerifyExp = h => h.SponsorName.Equals(sponsorCommand.SponsorName),
+                VerifyExp = h => (h.SponsorName.Equals(sponsorCommand.SponsorName)|| h.SponsorNameCN.Equals(sponsorCommand.SponsorNameCN)) && h.IsTrialLevel == false,
                 //---已经存在同名的申办方，请确认。
                 VerifyMsg = _localizer["Sponsor_DupName"]
             };