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/WfApplytypeService.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/WfApplytypeService.cs b/zhengcaioa/Services/WfApplytypeService.cs
index 86a9a08..0559fa6 100644
--- a/zhengcaioa/Services/WfApplytypeService.cs
+++ b/zhengcaioa/Services/WfApplytypeService.cs
@@ -127,7 +127,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);
@@ -162,7 +162,7 @@
{
- var listRole = _context.WfApplytypes.Where(r => r.RecStatus == "A").ToList();
+ var listRole = _context.WfApplytypes.Where(r => r.RecStatus == "A").OrderBy(x=>x.Sort).ToList();
var list = _mapper.Map<List<WfApplytypeDTO>>(listRole);
return list;
--
Gitblit v1.9.1