Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

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; }

IRaCIS.Core.Application/Service/Common/DictionaryService.cs

@@ -187,10 +187,10 @@ namespace IRaCIS.Application.Services
         /// <param name="searchArray"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<Dictionary<string, List<BasicDicSelect>>> GetBasicDataSelect(string[] searchArray)
+        public async Task<Dictionary<string, List<BasicDicSelectCopy>>> GetBasicDataSelect(string[] searchArray)
         {
 
-            var searchList = await _dicRepository.Where(t => searchArray.Contains(t.Parent.Code) && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelect>(_mapper.ConfigurationProvider).ToListAsync();
+            var searchList = await _dicRepository.Where(t => searchArray.Contains(t.Parent.Code) && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelectCopy>(_mapper.ConfigurationProvider).ToListAsync();
 
             return searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
 
@@ -209,6 +209,8 @@ namespace IRaCIS.Application.Services
         }
 
 
+
+
         /// <summary>
         /// 根据父亲字典分组  获取子项
         /// </summary>

IRaCIS.Core.Application/Service/Common/Interface/IDictionaryService.cs

@@ -33,7 +33,7 @@ namespace IRaCIS.Application.Interfaces
         /// <returns></returns>
         Task<string> GetBasicDataTranslateItem<T>(string parentCode, T childCode);
 
-        Task<Dictionary<string, List<BasicDicSelect>>> GetBasicDataSelect(string[] searchArray);
+        Task<Dictionary<string, List<BasicDicSelectCopy>>> GetBasicDataSelect(string[] searchArray);
 
     }
 }

IRaCIS.Core.Application/Service/Common/_MapConfig.cs

@@ -39,10 +39,13 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AddOrEditBasicDic, Dictionary>().ReverseMap();
 
+            CreateMap<Dictionary, BasicDicSelectCopy>()
+                 .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<Dictionary, BasicDicSelect>()
                  .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 = "";

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs

@@ -74,30 +74,31 @@ namespace IRaCIS.Core.Application.Contracts
                 //找下系统中是否存在该用户类型的 并且邮箱 或者手机的账户
                 var sysUserInfo = await _repository.Where<User>(t => t.UserTypeId == item.UserTypeId && t.EMail == item.Email).Include(t => t.UserTypeRole).FirstOrDefaultAsync();
 
-                if (sysUserInfo == null)
+                if (sysUserInfo != null)
-                {
-                    sysUserInfo = new User() { IsZhiZhun=false,IsTestUser= (trialType == TrialType.NoneOfficial) };                  
-                }
-
-                if (trialType == TrialType.OfficialTrial || trialType == TrialType.Training)
                 {
 
-                    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);