修改修改

username@email.com

2021-07-05 98cd7063d9b9a1570dcfbac92f5c2b35d904868b

 zhengcaioa/Services/HrSalaryService.cs

@@ -677,10 +677,13 @@
                        temp.reason = model.reason;
                        temp.amount = model.amount;
                        temp.basis = model.basis;
                        temp.sub_time = DateTime.Now;
                        temp.shenpi_status = model.shenpi_status;


                    }
                    else
                    {
                        model.id = Guid.NewGuid().ToString();
                        model.sub_time = DateTime.Now;
                        model.status = "A";
                        _context.HrSalaryAppeal.Add(model);
@@ -705,12 +708,20 @@
        /// <param name="id"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        public HrSalaryAppeal GetAppeal(string id,string user)
        public HrSalaryAppeal GetAppeal(string id = "", string user = "", string salaryId = "")
        {
            HrSalaryAppeal hd = new HrSalaryAppeal();
            try
            {
                hd = _context.HrSalaryAppeal.Where(e => e.salary_id == id && e.sub_user == user).SingleOrDefault();
                if (!string.IsNullOrEmpty(salaryId))
                {
                    hd = _context.HrSalaryAppeal.Where(e => e.salary_id == salaryId && e.sub_user == user && e.status == "A").FirstOrDefault();
                }
                else
                {
                    hd = _context.HrSalaryAppeal.Where(e => e.id == id && e.status == "A").FirstOrDefault();
                }
               
            }
            catch (Exception er)
            {