From ddd7b8e07e5d7f76e5ee28eaab91e75a419b3750 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 22 七月 2021 14:57:13 +0800
Subject: [PATCH] 今日开发 我的报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工作报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工资计算中的 新增注册会员 改为非手工几件登记，自动从系统读取
---
zhengcaioa/Services/AdmEvaluateService.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/AdmEvaluateService.cs b/zhengcaioa/Services/AdmEvaluateService.cs
index fd109f5..b1356ca 100644
--- a/zhengcaioa/Services/AdmEvaluateService.cs
+++ b/zhengcaioa/Services/AdmEvaluateService.cs
@@ -171,7 +171,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
@@ -257,8 +257,8 @@
from ccc in csssss.DefaultIfEmpty()
- where a.RecStatus == "A"
-
+ where a.RecStatus == "A" && a.Zhiwustatus == "A"
+
&& (string.IsNullOrWhiteSpace(searchEntity.DeptId) || a.DeptId == searchEntity.DeptId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.UserName) || a.UserName.Contains(searchEntity.UserName.Trim()))
@@ -293,11 +293,11 @@
Modifytime = a.Modifytime,
}
- ).OrderByDescending(x => x.UserSn).ToList();
+ ).OrderByDescending(x => x.DeptId).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
--
Gitblit v1.9.1