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

LR-20210131IOQH\Administrator

2021-08-10 d4a6d65f5e449c3e5464aa18ae97bf8953987217

 zhengcaioa/Services/UserService.cs

@@ -189,6 +189,7 @@
                    updatepltUser.jibensalary = pltUser.jibensalary;
                    updatepltUser.jintiesalary = pltUser.jintiesalary;
                    updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
                    updatepltUser.Yaoqingma = pltUser.Yaoqingma;
                }

                _context.SaveChanges();
@@ -335,7 +336,7 @@
                             jintiesalaryName = a.jintiesalary.HasValue ? a.jintiesalary.Value.ToString("F2") : "",
                             geshuiqizheng = a.geshuiqizheng,
                             geshuiqizhengName = a.geshuiqizheng.HasValue ? a.geshuiqizheng.Value.ToString("F2") : "",

                             Yaoqingma = a.Yaoqingma,
                         }
              ).OrderBy(x => x.Usernumber).ToList();

@@ -347,7 +348,7 @@
             

          //  query = query.OrderByDescending(x => x.Modifytime).ToList();
            if (searchEntity.totalrows == 0)
            //if (searchEntity.totalrows == 0)
                searchEntity.totalrows = query.Count();
            var userlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
           // list = _mapper.Map<List<PltUserDTO>>(userlist);