系统文档修改

2024-10-25 15:12:33 +08:00
parent a3c0bacff2
commit 7f0e998eba
6 changed files with 18119 additions and 8 deletions
@@ -185,6 +185,8 @@ namespace IRaCIS.Core.Application.Contracts

        public int SignViewMinimumMinutes { get; set; }

+        public DocUserSignType DocUserSignType { get; set; }
+
    }

    public class AddOrEditSystemDocument : SystemDocumentAddOrEdit
@@ -149,7 +149,7 @@ namespace IRaCIS.Core.Application.Services
            var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                    .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                    //外部人员 只签署 文档类型枚举值有值的
-                    .WhereIf(isInternal == false, t => t.FileType.Code.Length == 0)
+                    .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.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                        from confirm in cc.DefaultIfEmpty()