From 00446e5e764fd57ea0f28b30921f4a5daa60c890 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 23 七月 2021 14:10:31 +0800
Subject: [PATCH] 流程 费用申请，物品申领
---
zhengcaioa/Services/FiAccountRecordService.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/FiAccountRecordService.cs b/zhengcaioa/Services/FiAccountRecordService.cs
index a57992c..f8a78fc 100644
--- a/zhengcaioa/Services/FiAccountRecordService.cs
+++ b/zhengcaioa/Services/FiAccountRecordService.cs
@@ -132,7 +132,8 @@
&& (string.IsNullOrWhiteSpace(searchEntity.PaymentUnit) || a.PaymentUnit.Contains(searchEntity.PaymentUnit.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.CreaterName) || y.UserName.Contains(searchEntity.CreaterName.Trim()))
&& (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
-
+ && (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
+
select new FiAccountRecordDTO
{
Id = a.Id,
@@ -159,6 +160,7 @@
QiyongStatus = a.QiyongStatus,
RecStatus = a.RecStatus,
Balance = z.Balance??0,
+ AccountMoney = a.AccountMoney??0,
}).OrderByDescending(x => x.Modifytime).ToList();
@@ -168,7 +170,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
--
Gitblit v1.9.1