From c28a5cd5367ba6a0d210dc897fd9a7cf6e46e570 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 二月 2023 09:40:06 +0800
Subject: [PATCH] 把会员系统和oa系统手机号相同的客户关联起来
---
zhengcaioa/Services/ExpertService.cs | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/ExpertService.cs b/zhengcaioa/Services/ExpertService.cs
index 2721acd..9ac0256 100644
--- a/zhengcaioa/Services/ExpertService.cs
+++ b/zhengcaioa/Services/ExpertService.cs
@@ -293,11 +293,11 @@
}
if (!string.IsNullOrEmpty(searchEntity.CertiNumber))
{
- query = query.Where(m => m.CertiNumber.Contains(searchEntity.CertiNumber)).ToList();
+ query = query.Where(m => m.CertiNumber != null && m.CertiNumber.Contains(searchEntity.CertiNumber)).ToList();
}
if (!string.IsNullOrEmpty(searchEntity.Phone1))
{
- query = query.Where(m => m.Phone1.Contains(searchEntity.Phone1)).ToList();
+ query = query.Where(m => m.Phone1 != null && m.Phone1.Contains(searchEntity.Phone1)).ToList();
}
if (!string.IsNullOrEmpty(searchEntity.Creater))
{
@@ -818,5 +818,16 @@
}
return resultEntity;
}
+
+
+ public List<ExpertDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.Experts.Where(r => r.RecStatus == "A"&& r.ShenheStatus=="A"&& r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+ var list = _mapper.Map<List<ExpertDTO>>(listPosition);
+ return list;
+ }
}
}
--
Gitblit v1.9.1