From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 八月 2021 14:29:15 +0800
Subject: [PATCH] 今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增，短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 工作报表 修改排版 问题维护 试用法条 改为1000字， 问题查询打开直接默认未审核，不要停两秒再刷新 项目新增 增加字段：采购预算 万元 工作考评 考聘不称职当天无工资
---
zhengcaioa/Services/ExpertService.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/ExpertService.cs b/zhengcaioa/Services/ExpertService.cs
index b1fb522..d7fdd28 100644
--- a/zhengcaioa/Services/ExpertService.cs
+++ b/zhengcaioa/Services/ExpertService.cs
@@ -239,7 +239,7 @@
query = query.OrderByDescending(x => x.Modifytime).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var expertlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
//list = _mapper.Map<List<ExpertDTO>>(expertlist);
@@ -268,7 +268,7 @@
public List<ExpertDTO> GetList()
{
- var listExperts = _context.Experts.Where(e => e.RecStatus == "A").ToList();
+ var listExperts = _context.Experts.Where(e => e.RecStatus == "A" && e.ShenheStatus == "A").ToList();
var list = _mapper.Map<List<ExpertDTO>>(listExperts);
return list;
}
@@ -325,7 +325,7 @@
query = query.Where(m => m.Creater.Contains(searchEntity.Creater)).ToList();
}
query = query.OrderByDescending(x => x.Modifytime).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var expertlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
list = _mapper.Map<List<ExpertPromoteDTO>>(expertlist);
@@ -455,7 +455,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);
@@ -618,7 +618,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);
--
Gitblit v1.9.1