Commit f2b97710 by lcx

其他绩效审核分组修改

parent 18e77587
......@@ -283,7 +283,7 @@ public ApiResponse GetAprGroupList([FromBody] per_apr_amount request)
if (employee == null || !employee.Any())
return new ApiResponse(ResponseType.OK, "ok", employee);
var result = employee.GroupBy(t => new { t.AccountingUnit, t.TypeInDepartment }).Select(t => new per_apr_amount
var result = employee.GroupBy(t => new { AccountingUnit = t.AccountingUnit ?? "", TypeInDepartment = t.TypeInDepartment ?? "" }).Select(t => new per_apr_amount
{
AccountingUnit = t.Key.AccountingUnit,
TypeInDepartment = t.Key.TypeInDepartment,
......
......@@ -385,7 +385,7 @@ public List<per_apr_amount> GetAprList(int allotId)
public List<per_apr_amount> GetAprList(int allotId, string accountingUnit, string department)
{
var list = perapramountRepository.GetEntities(t => t.AllotId == allotId && t.AccountingUnit == accountingUnit && t.TypeInDepartment == department);
var list = perapramountRepository.GetEntities(t => t.AllotId == allotId && (t.AccountingUnit ?? "") == accountingUnit && (t.TypeInDepartment ?? "") == department);
if (list != null && list.Any())
list = list.OrderBy(t => t.DoctorName).ToList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment