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/HrJixiaotichengService.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/HrJixiaotichengService.cs b/zhengcaioa/Services/HrJixiaotichengService.cs
index e549023..d124630 100644
--- a/zhengcaioa/Services/HrJixiaotichengService.cs
+++ b/zhengcaioa/Services/HrJixiaotichengService.cs
@@ -125,6 +125,7 @@
where a.RecStatus == "A"
&& (string.IsNullOrWhiteSpace(searchEntity.PostId) || a.PostId == searchEntity.PostId.Trim())
+ && (string.IsNullOrWhiteSpace(searchEntity.PiecerateId) || a.PiecerateId == searchEntity.PiecerateId.Trim())
select new HrJixiaotichengDTO
{
Id = a.Id,
@@ -163,7 +164,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