diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs index b0f6b55ba..32ef8a3e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Gz_Amounts/Gz_AmountsService.cs @@ -451,33 +451,39 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } var items = this.BaseRepository("CollegeMIS").FindList(x => x.IsShow == true).ToList(); + if (items.Any()) + { + var xmId = items.FirstOrDefault(x => x.Name == "职员姓名").Id; + var deptCodeId = items.FirstOrDefault(x => x.Name == "部门代码").Id; + var deptId = items.FirstOrDefault(x => x.Name == "部门名称").Id; + var ptcId = items.FirstOrDefault(x => x.Name == "职员类型代码").Id; + var ptId = items.FirstOrDefault(x => x.Name == "职员类型").Id; + var sendId = items.FirstOrDefault(x => x.Name == "发放时间").Id; + var sendCountId = items.FirstOrDefault(x => x.Name == "发放次数").Id; + var kchjId = items.FirstOrDefault(x => x.Name == "扣款合计").Id; + var sfhjId = items.FirstOrDefault(x => x.Name == "实发合计").Id; + var bzId = items.FirstOrDefault(x => x.Name == "备注").Id; + var shrId = items.FirstOrDefault(x => x.Name == "审核人").Id; - var xmId = items.FirstOrDefault(x => x.Name == "职员姓名").Id; - var deptCodeId = items.FirstOrDefault(x => x.Name == "部门代码").Id; - var deptId = items.FirstOrDefault(x => x.Name == "部门名称").Id; - var ptcId = items.FirstOrDefault(x => x.Name == "职员类型代码").Id; - var ptId = items.FirstOrDefault(x => x.Name == "职员类型").Id; - var sendId = items.FirstOrDefault(x => x.Name == "发放时间").Id; - var sendCountId = items.FirstOrDefault(x => x.Name == "发放次数").Id; - var kchjId = items.FirstOrDefault(x => x.Name == "扣款合计").Id; - var sfhjId = items.FirstOrDefault(x => x.Name == "实发合计").Id; - var bzId = items.FirstOrDefault(x => x.Name == "备注").Id; - var shrId = items.FirstOrDefault(x => x.Name == "审核人").Id; - - var itemId = items.Select(x => x.Id).ToArray(); + var itemId = items.Select(x => x.Id).ToArray(); - var q = this.BaseRepository("CollegeMIS").FindList(x => x.UserNo == userNo && itemId.Contains(x.ItemId) && ((yearStart == yearEnd && x.Year == yearStart && x.Month >= monthStart && x.Month <= monthEnd) || (yearStart < yearEnd && (x.Year == yearStart && x.Month >= monthStart) || (x.Year == yearEnd && x.Month <= monthEnd) || (x.Year > yearStart && x.Year < yearEnd)))); + var q = this.BaseRepository("CollegeMIS").FindList(x => x.UserNo == userNo && itemId.Contains(x.ItemId) && ((yearStart == yearEnd && x.Year == yearStart && x.Month >= monthStart && x.Month <= monthEnd) || (yearStart < yearEnd && (x.Year == yearStart && x.Month >= monthStart) || (x.Year == yearEnd && x.Month <= monthEnd) || (x.Year > yearStart && x.Year < yearEnd)))); - var query = q.GroupBy(x => new { x.UserNo, x.Year, x.Month }); - pagination.records = query.Count(); + var query = q.GroupBy(x => new { x.UserNo, x.Year, x.Month }); + pagination.records = query.Count(); - var ls = query.Select(x => new Gz_AmountsCols { UserNo = x.Key.UserNo, Year = x.Key.Year ?? 0, Month = x.Key.Month ?? 0, RealName = x.FirstOrDefault(a => a.ItemId == xmId)?.OriVal ?? "", DeptCode = x.FirstOrDefault(a => a.ItemId == deptCodeId)?.OriVal ?? "", DeptName = x.FirstOrDefault(a => a.ItemId == deptId)?.OriVal ?? "", PersonTypeCode = x.FirstOrDefault(a => a.ItemId == ptcId)?.OriVal ?? "", PersonType = x.FirstOrDefault(a => a.ItemId == ptId)?.OriVal ?? "", SendDate = x.FirstOrDefault(a => a.ItemId == sendId)?.OriVal ?? "", SendCount = x.FirstOrDefault(a => a.ItemId == sendCountId)?.OriVal ?? "", TotalDeduction = x.FirstOrDefault(a => a.ItemId == kchjId)?.OriVal ?? "", TotalSend = x.FirstOrDefault(a => a.ItemId == sfhjId)?.OriVal ?? "", TotalSendDecimal = x.FirstOrDefault(a => a.ItemId == sfhjId)?.Amount ?? 0, Remark = x.FirstOrDefault(a => a.ItemId == bzId)?.OriVal ?? "", Reviewer = x.FirstOrDefault(a => a.ItemId == shrId)?.OriVal ?? "" }); + var ls = query.Select(x => new Gz_AmountsCols { UserNo = x.Key.UserNo, Year = x.Key.Year ?? 0, Month = x.Key.Month ?? 0, RealName = x.FirstOrDefault(a => a.ItemId == xmId)?.OriVal ?? "", DeptCode = x.FirstOrDefault(a => a.ItemId == deptCodeId)?.OriVal ?? "", DeptName = x.FirstOrDefault(a => a.ItemId == deptId)?.OriVal ?? "", PersonTypeCode = x.FirstOrDefault(a => a.ItemId == ptcId)?.OriVal ?? "", PersonType = x.FirstOrDefault(a => a.ItemId == ptId)?.OriVal ?? "", SendDate = x.FirstOrDefault(a => a.ItemId == sendId)?.OriVal ?? "", SendCount = x.FirstOrDefault(a => a.ItemId == sendCountId)?.OriVal ?? "", TotalDeduction = x.FirstOrDefault(a => a.ItemId == kchjId)?.OriVal ?? "", TotalSend = x.FirstOrDefault(a => a.ItemId == sfhjId)?.OriVal ?? "", TotalSendDecimal = x.FirstOrDefault(a => a.ItemId == sfhjId)?.Amount ?? 0, Remark = x.FirstOrDefault(a => a.ItemId == bzId)?.OriVal ?? "", Reviewer = x.FirstOrDefault(a => a.ItemId == shrId)?.OriVal ?? "" }); - - var rs = ls.Skip(skip).Take(pagination.rows); - return rs; + var rs = ls.Skip(skip).Take(pagination.rows); + return rs; + } + else + { + pagination.records = 0; + return new List(); + } } catch (Exception ex) {