修改面板列表

2022-04-15 11:11:13 +08:00
parent e8a051273d
commit 0364cb378e
3 changed files with 22 additions and 24 deletions
@@ -124,12 +124,13 @@ namespace IRaCIS.Core.Application.Services
        /// </summary>
        /// <returns></returns>

-        public async Task<List<UnionDocumentWithConfirmInfoView>> GetWaitSignSysDocList()
+        public async Task<PageOutput<UnionDocumentWithConfirmInfoView>>  GetWaitSignSysDocList(SystemDocumentQuery querySystemDocument)
        {


            var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
-
+                    .WhereIf(!string.IsNullOrEmpty(querySystemDocument.Name), t => t.Name.Contains(querySystemDocument.Name))
+                    .WhereIf(querySystemDocument.FileTypeId != null, t => t.FileTypeId == querySystemDocument.FileTypeId)
                        join confirm in _repository.GetQueryable<SystemDocConfirmedUser>() on new { ConfirmUserId = _userInfo.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                        from confirm in cc.DefaultIfEmpty()

@@ -157,7 +158,7 @@ namespace IRaCIS.Core.Application.Services
                            UserTypeShortName = user.UserTypeRole.UserTypeShortName
                        };

-            return await query.Where(t=>t.ConfirmTime==null).ToListAsync();
+            return await query.Where(t=>t.ConfirmTime==null).ToPagedListAsync(querySystemDocument.PageIndex, querySystemDocument.PageSize, querySystemDocument.SortField, querySystemDocument.Asc);