zhengcaioa.git - Gitblit

			@@ -350,7 +350,7 @@



			if (searchEntity.totalrows == 0)
			//if (searchEntity.totalrows == 0)
			searchEntity.totalrows = query.Count();
			var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();

			@@ -488,7 +488,7 @@



			if (searchEntity.totalrows == 0)
			//if (searchEntity.totalrows == 0)
			searchEntity.totalrows = query.Count();
			var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
			if(rolelist!=null && rolelist.Count>0)
			@@ -696,7 +696,9 @@
			temp.reason = model.reason;
			temp.amount = model.amount;
			temp.basis = model.basis;
			temp.sub_time = DateTime.Now;
			temp.shenpi_status = model.shenpi_status;


			}
			else
			{
			@@ -727,12 +729,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)
			{
			@@ -850,7 +860,7 @@
			}).OrderByDescending(x => x.Modifytime).ToList();


			if (searchEntity.totalrows == 0)
			//if (searchEntity.totalrows == 0)
			searchEntity.totalrows = list.Count();
			var rolelist = list.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
			if (rolelist != null && rolelist.Count > 0)