username@email.com
2021-08-10 32609928898a897f7407c240bcdc6dc4e6415f0f
zhengcaioa/Services/HrSalaryService.cs
@@ -410,14 +410,14 @@
            //                }
            //         );
            //int year = 0;
            //int month = 0;
            //if (string.IsNullOrWhiteSpace(searchEntity.YearMonth))
            //{
            //    DateTime yearMonth = DateTime.Now;//.Parse(searchEntity.YearMonth + "-01");
            //    year = yearMonth.Year;
            //    month = yearMonth.Month;
            //}
            int year = 0;
            int month = 0;
            if (!string.IsNullOrWhiteSpace(searchEntity.YearMonth))
            {
                DateTime yearMonth = DateTime.Parse(searchEntity.YearMonth + "-01");
                year = yearMonth.Year;
                month = yearMonth.Month;
            }
            var query = (from a in _context.HrSalaries//.Where(x => x.RecStatus == "A")
                        // join b in listCode.Where(x => x.CodeTable == "hr_jibengongzi" && x.CodeField == "dianhuabutie")
                        //on a.Dianhuabutie equals b.CodeSn
@@ -438,7 +438,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()))
                              //&& (string.IsNullOrWhiteSpace(searchEntity.YearMonth) || ( a.Year == year && a.Month == month ))
                              && (string.IsNullOrWhiteSpace(searchEntity.YearMonth) || ( a.Year == year && a.Month == month ))
                         select new HrSalaryDTO
                         {
                             Id = a.Id,