From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/FiAccountRecordService.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/FiAccountRecordService.cs b/zhengcaioa/Services/FiAccountRecordService.cs
index 3c209b2..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,
@@ -169,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