项目文档修改临时提交

IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs

@@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Services
     [ApiExplorerSettings(GroupName = "Trial")]
     public class SystemDocumentService(IRepository<SystemDocument> _systemDocumentRepository,
         IRepository<UserRole> _userRoleRepository,
-        IRepository<SystemDocConfirmedUser> _systemDocConfirmedUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemDocumentService
+        IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISystemDocumentService
     {
 
 
@@ -109,7 +109,7 @@ namespace IRaCIS.Core.Application.Services
 
             await _systemDocumentRepository.UpdatePartialFromQueryAsync(systemDocumentId, u => new SystemDocument() { IsDeleted = true });
 
-            await _systemDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.SystemDocumentId == systemDocumentId, x => new SystemDocConfirmedUser()
+            await _systemDocConfirmedUserRepository.UpdatePartialFromQueryAsync(x => x.SystemDocumentId == systemDocumentId, x => new SystemDocConfirmedIdentityUser()
             {
                 IsDeleted = true
             });
@@ -151,7 +151,7 @@ namespace IRaCIS.Core.Application.Services
                     //外部人员 只签署 文档类型枚举值有值的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                     .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
-                        join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.UserRoleId, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
+                        join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.IdentityUserId, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                         from confirm in cc.DefaultIfEmpty()
 
                         join user in _userRoleRepository.Where() on _userInfo.UserRoleId equals user.Id
@@ -175,8 +175,9 @@ namespace IRaCIS.Core.Application.Services
                             ConfirmTime = confirm.ConfirmTime,
                             RealName = user.FullName,
                             UserName = user.UserName,
-                            UserTypeId = user.UserTypeId,
-                            UserTypeShortName = user.UserTypeRole.UserTypeShortName
+
+                            //UserTypeId = user.UserTypeId,
+                            //UserTypeShortName = user.UserTypeRole.UserTypeShortName
                         };
 
             return await query.WhereIf(inQuery.IsSigned == true, t => t.ConfirmTime != null)