Commit 1aeb3531 by 赵剑炜

修复储备统计报表中包含报销的物资

parent b0e649ce
...@@ -1461,14 +1461,14 @@ namespace JunmpPoliceStation.Controllers ...@@ -1461,14 +1461,14 @@ namespace JunmpPoliceStation.Controllers
if (level == "本级") if (level == "本级")
{ {
expressionPoliceman = t => t.OrgId.Equals(orgizationCode) && t.CurrentState != null; expressionPoliceman = t => t.OrgId.Equals(orgizationCode) && t.CurrentState != null && t.CurrentState != 5 && t.CurrentState != 6;
} }
else else
{ {
dataList = GetClassID(orgizationCode); dataList = GetClassID(orgizationCode);
dataList = dataList.ToList().Concat(ListEq.Where(c => c.Id.Equals(orgizationCode))).ToList(); dataList = dataList.ToList().Concat(ListEq.Where(c => c.Id.Equals(orgizationCode))).ToList();
List<string> IdList = dataList.Select(c => c.Id).ToList(); List<string> IdList = dataList.Select(c => c.Id).ToList();
expressionPoliceman = t => IdList.Contains(t.OrgId) && t.CurrentState != null; expressionPoliceman = t => IdList.Contains(t.OrgId) && t.CurrentState != 5 && t.CurrentState != 6;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论