Commit 02c4f684 by ruyun.zhang@suvalue.com

Merge branch 'hotfix/二次分配审核0隐藏'

parents 8dd27437 04acc2d7
......@@ -1551,7 +1551,7 @@ private List<ag_secondallot> SecondList(per_allot allot, List<res_account> accou
};
});
var enums = EnumHelper.GetItems<UnitType>();
return result.Where(w => w.RealGiveFee != 0)
return result.Where(w => w.RealGiveFee.HasValue && w.RealGiveFee != 0)
.OrderBy(t => t.Status == 4 ? 2 : t.Status)
.ThenBy(t => enums.FirstOrDefault(f => f.Name == t.UnitType)?.Value)
.ThenBy(t => t.Department)
......
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