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

username@email.com

2021-06-28 76430b83e28b43122886c1cd8a9fb1cd61040d22

 zhengcaioa/Services/HrSalaryService.cs

@@ -101,6 +101,13 @@
                var updatepltRole = _context.HrSalaries.Where(c=>c.Id==dto.Id).SingleOrDefault();
                if(updatepltRole!=null)
                {
                    //更新电话费用状态
                    var sim = _context.SimCost.Where(c => c.bill_year == dto.Year && c.bill_month <= dto.Month && c.user_id == dto.Userid && c.status == "0").ToList();
                    foreach(var item in sim)
                    {
                        item.status = "1";
                    }

                    var user = _context.PltUsers.Where(c => c.Id == updatepltRole.Userid).SingleOrDefault();

                    updatepltRole.Jiangjin = dto.Jiangjin;
@@ -546,6 +553,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>