From 1a377b23dc06ea31d0c0a368072ff1b52a4e6a40 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 10 八月 2021 16:10:44 +0800
Subject: [PATCH] tijiao
---
zhengcaioa/Services/HrSalaryService.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index 6468730..b20d382 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -415,7 +415,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Usernumber) || f.Usernumber == searchEntity.Usernumber.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.DeptId) || f.DeptId == searchEntity.DeptId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.UserName) || f.UserName.Contains(searchEntity.UserName.Trim()))
- && ( (a.Year == year && a.Month == month))
+ && (string.IsNullOrWhiteSpace(searchEntity.YearMonth) || ( a.Year == year && a.Month == month ))
select new HrSalaryDTO
{
Id = a.Id,
--
Gitblit v1.9.1