diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
index 4c278ddcb..83c88f70e 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
@@ -98,6 +98,11 @@ namespace IRaCIS.Application.Contracts
public string Description { get; set; } = string.Empty;
}
+
+ public class BasicDicSelectCopy:BasicDicSelect
+ {
+
+ }
public class BasicDicSelect
{
public Guid Id { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
index 995217b61..4634797a0 100644
--- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
@@ -201,14 +201,16 @@ namespace IRaCIS.Application.Services
///
///
///
- public async Task> GetBasicDataSelect(string searchKey)
+ public async Task> GetBasicDataSelect(string searchKey)
{
- var searchList = await _dicRepository.Where(t => t.Parent.Code == searchKey && t.ParentId != null && t.IsEnable).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ var searchList = await _dicRepository.Where(t => t.Parent.Code == searchKey && t.ParentId != null && t.IsEnable).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
return searchList;
}
+
+
///
/// 根据父亲字典分组 获取子项
///
diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
index 67e4ef6fc..142c56b3b 100644
--- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
@@ -39,10 +39,13 @@ namespace IRaCIS.Core.Application.Service
CreateMap().ReverseMap();
+ CreateMap()
+ .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
+ .ForMember(o => o.Value, t => t.MapFrom(u => u.MappedValue))
+ .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
CreateMap()
.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
- .ForMember(o => o.Value, t => t.MapFrom(u => u.MappedValue))
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
var token = "";
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs
index aad23f9b1..d8877f22a 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs
@@ -74,30 +74,31 @@ namespace IRaCIS.Core.Application.Contracts
//找下系统中是否存在该用户类型的 并且邮箱 或者手机的账户
var sysUserInfo = await _repository.Where(t => t.UserTypeId == item.UserTypeId && t.EMail == item.Email).Include(t => t.UserTypeRole).FirstOrDefaultAsync();
- if (sysUserInfo == null)
- {
- sysUserInfo = new User() { IsZhiZhun=false,IsTestUser= (trialType == TrialType.NoneOfficial) };
- }
-
- if (trialType == TrialType.OfficialTrial || trialType == TrialType.Training)
+ if (sysUserInfo != null)
{
- if (sysUserInfo.IsTestUser)
+ if (trialType == TrialType.OfficialTrial || trialType == TrialType.Training)
{
- throw new BusinessValidationFailedException("正式类型 、培训类型的项目 不允许加入测试用户 ");
+ if (sysUserInfo.IsTestUser)
+ {
+ throw new BusinessValidationFailedException("正式类型 、培训类型的项目 不允许加入测试用户 ");
+
+ }
+ }
+
+ if (trialType == TrialType.NoneOfficial)
+ {
+
+ if (sysUserInfo.IsTestUser == false)
+ {
+ throw new BusinessValidationFailedException("测试项目 不允许加入正式用户 ");
+
+ }
}
}
- if (trialType == TrialType.NoneOfficial)
- {
-
- if (sysUserInfo.IsTestUser == false)
- {
- throw new BusinessValidationFailedException("测试项目 不允许加入正式用户 ");
-
- }
- }
+
}
var entity = await _trialSiteUserSurveyRepository.InsertOrUpdateAsync(addOrEditTrialSiteUserSurvey, true);