LR-20210131IOQH\Administrator
2021-08-10 11e11a51839529b17f70927524e086e90adf692d
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -62,7 +62,7 @@
        /// <returns></returns>
        public IActionResult GetList(HrSalaryDTOSearch search)
        {
            _hrSalaryService.AutoCheck();
            //_hrSalaryService.AutoCheck();
            return new JsonResult(_hrSalaryService.SearchSalaryByPaging(search));
        }
@@ -78,6 +78,22 @@
            if (!string.IsNullOrEmpty(id))
            {
                dto = _hrSalaryService.Get(id);
            }
            if(!dto.Jiangjin.HasValue)
            {
                dto.Jiangjin = 0;
            }
            if (!dto.Bufagongzi.HasValue)
            {
                dto.Bufagongzi = 0;
            }
            if (!dto.Peichang.HasValue)
            {
                dto.Peichang = 0;
            }
            if (!dto.Jiucuo.HasValue)
            {
                dto.Jiucuo = 0;
            }
            ViewData.Model = dto;
            return View();
@@ -215,7 +231,7 @@
        public IActionResult GetSearchList(HrSalaryDTOSearch search)
        {
            //自动确认
            _hrSalaryService.AutoCheck();
            //_hrSalaryService.AutoCheck();
            return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
        }