From 072169e3c5446f94e2cf4e570e5c7952bb5b15b9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 七月 2021 14:47:44 +0800
Subject: [PATCH] 今日开发 考勤规则里增加 公司安排加班 调整请假时间计算 加班日考勤计算
---
zhengcaioa/Services/WfNeeddeelService.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/WfNeeddeelService.cs b/zhengcaioa/Services/WfNeeddeelService.cs
index ee0563f..a481d95 100644
--- a/zhengcaioa/Services/WfNeeddeelService.cs
+++ b/zhengcaioa/Services/WfNeeddeelService.cs
@@ -202,11 +202,11 @@
Modifytime = a.Modifytime,
}
- ).OrderBy(x => x.Sort).ThenByDescending(x => x.Resivetime).ToList();
+ ).OrderByDescending(x=>x.Applyno).ThenBy(x => x.Sort).ThenByDescending(x => x.Resivetime).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