Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

LR-20210131IOQH\Administrator

2021-06-27 3262eb334953a1b208aa4a50584442a3804912d9

 zhengcaioa/Services/HrSalaryService.cs

@@ -546,6 +546,26 @@
            return list;
        }



        /// <summary>
        /// 获取所有有效角色
        /// </summary>
        /// <returns></returns>
        public HrSalaryDTO GetListByUser(string Userid, int year, int month)
        {


            var listPosition = _context.HrSalaries.Where(r => r.RecStatus == "A" && r.Userid == Userid && r.Year == year && r.Month == month).FirstOrDefault();

            HrSalaryDTO hrSalaryDTO = null;
            if (listPosition != null)
            {
                hrSalaryDTO = _mapper.Map<HrSalaryDTO>(listPosition);
            }

            return hrSalaryDTO;
        }
        /// <summary>
        /// 工资核对
        /// </summary>