政采招标oa系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
username@email.com
2021-07-26 3b9bf8c309d77d9817e973aa036e045695c78d70 
 zhengcaioa/Services/AdmEvaluateService.cs


@@ -171,7 +171,7 @@








            if (searchEntity.totalrows == 0)


            //if (searchEntity.totalrows == 0)


                searchEntity.totalrows = query.Count();


            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();


            data.LoadData(searchEntity, lianlist);


@@ -257,8 +257,8 @@


                         from ccc in csssss.DefaultIfEmpty()






                         where a.RecStatus == "A"


                          


                         where a.RecStatus == "A" &&  a.Zhiwustatus == "A"




                          && (string.IsNullOrWhiteSpace(searchEntity.DeptId) || a.DeptId == searchEntity.DeptId.Trim())




                          && (string.IsNullOrWhiteSpace(searchEntity.UserName) || a.UserName.Contains(searchEntity.UserName.Trim()))


@@ -293,11 +293,11 @@


                             Modifytime = a.Modifytime,




                         }


                ).OrderByDescending(x => x.UserSn).ToList();


                ).OrderByDescending(x => x.DeptId).ToList();








            if (searchEntity.totalrows == 0)


            //if (searchEntity.totalrows == 0)


                searchEntity.totalrows = query.Count();


            var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();


            data.LoadData(searchEntity, lianlist);