修改管理用户类型过滤

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1466,6 +1466,13 @@
             <param name="inQuery"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialFileTypeService.CopySystemFileTypeToTrial(IRaCIS.Core.Application.ViewModel.CopySystemFileTypeToTrialInDto)">
+            <summary>
+            复制系统数据到项目
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TrialFinalRecordService">
             <summary>
             项目定稿记录

IRaCIS.Core.Application/Service/Management/UserTypeService.cs

@@ -141,7 +141,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
-            var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin)
+            var query = _userTypeRepository.Where(x => x.UserTypeEnum != UserTypeEnum.SuperAdmin && x.IsEnable==true)
               .WhereIf(userTypeSelectEnum != UserTypeSelectEnum.None, t => userTypeEnums.Contains(t.UserTypeEnum))
               .OrderBy(t => t.UserTypeShortName).ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);
 

IRaCIS.Core.Application/TestService.cs

@@ -166,6 +166,16 @@ namespace IRaCIS.Core.Application.Service
             {
                 var userRoleList = item.OrderBy(t => t.CreateTime).ToList();
 
+                foreach (var userRole in userRoleList)
+                {
+                    var isTrue = userRole.UserTypeEnum == UserTypeEnum.SystemAdmin || userRole.UserTypeEnum == UserTypeEnum.OP || userRole.UserTypeEnum == UserTypeEnum.Dashboard;
+
+                    if (isTrue)
+                    {
+                        await _userRoleRepository.BatchUpdateNoTrackingAsync(t => t.Id == userRole.Id, t => new UserRole() { IsUserRoleDisabled = true });
+                    }
+                }
+
                 var firstCreateRole = userRoleList.FirstOrDefault();
 
                 var firstTrialId = _trialUserRoleRepository.Where(t => t.TrialUser.IdentityUserId == firstCreateRole.IdentityUserId).IgnoreQueryFilters().OrderBy(t => t.CreateTime).Select(t => t.TrialId).FirstOrDefault();

IRaCIS.Core.Domain.Share/User/UserType.cs

@@ -62,6 +62,9 @@
 
         OP=31,
 
+        //仅仅管理后端部分数据，现在不用
+        SystemAdmin=32,
+
         //医生用户类型暂不处理
 
         ShareImage = 125,