修改 面板列表

This commit is contained in:
2022-04-15 11:11:13 +08:00
parent e8a051273d
commit 0364cb378e
3 changed files with 22 additions and 24 deletions
@@ -134,28 +134,25 @@ namespace IRaCIS.Core.Application
.WhereIf(!_userInfo.IsAdmin, c => c.TrialDocumentList.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) && !t.TrialDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id)).Count() > 0)
.ProjectTo<DocSignStat>(_mapper.ConfigurationProvider, new { userTypeEnumInt = _userInfo.UserTypeEnumInt, userId = _userInfo.Id, userTypeId = _userInfo.UserTypeId })
.OrderByDescending(t => t.WaitSignCount)
.ToPagedListAsync(query.PageIndex, query.PageSize - 1, query.SortField, query.Asc);
.ToPagedListAsync(query.PageIndex, query.PageSize , query.SortField, query.Asc);
//var sysDocStat = new DocSignStat()
//{
// IsSystemDoc = true,
// WaitSignCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
// ? 0
// : await _systemDocumentRepository
// .Where(t =>
// t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) &&
// !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id))
// .CountAsync()
//};
//var list = trialDocStat.CurrentPageData.ToList();
//list.Insert(0, sysDocStat);
//trialDocStat.CurrentPageData = list;
//trialDocStat.TotalCount++;
var sysDocStat = new DocSignStat()
{
IsSystemDoc = true,
WaitSignCount = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin
? 0
: await _systemDocumentRepository
.Where(t =>
t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId) &&
!t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id))
.CountAsync()
};
var list = trialDocStat.CurrentPageData.ToList();
list.Insert(0, sysDocStat);
trialDocStat.CurrentPageData = list;
trialDocStat.TotalCount++;
return trialDocStat;
}