x

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

@@ -201,14 +201,16 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="searchKey"></param>
         /// <returns></returns>
-        public async Task<List<BasicDicSelect>> GetBasicDataSelect(string searchKey)
+        public async Task<List<BasicDicSelectCopy>> GetBasicDataSelect(string searchKey)
         {
-            var searchList = await _dicRepository.Where(t => t.Parent.Code == searchKey && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelect>(_mapper.ConfigurationProvider).ToListAsync();
+            var searchList = await _dicRepository.Where(t => t.Parent.Code == searchKey && t.ParentId != null && t.IsEnable).ProjectTo<BasicDicSelectCopy>(_mapper.ConfigurationProvider).ToListAsync();
 
             return searchList;
         }
 
 
+
+
         /// <summary>
         /// 根据父亲字典分组  获取子项
         /// </summary>

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,10 +74,8 @@ 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)
                     {
@@ -100,6 +98,9 @@ namespace IRaCIS.Core.Application.Contracts
                     }
                 }
 
+               
+            }
+
             var entity = await _trialSiteUserSurveyRepository.InsertOrUpdateAsync(addOrEditTrialSiteUserSurvey, true);
 
             return ResponseOutput.Ok(entity.Id.ToString());