From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/UserService.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index b17abda..32f4736 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/zhengcaioa/Services/UserService.cs
@@ -29,7 +29,7 @@
public PltUser login(string user_sn, string password)
{
- var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A").FirstOrDefault();
+ var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A" && x.Zhiwustatus == "A" ).FirstOrDefault();
return user;
}
@@ -189,6 +189,8 @@
updatepltUser.jibensalary = pltUser.jibensalary;
updatepltUser.jintiesalary = pltUser.jintiesalary;
updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
+ updatepltUser.Yaoqingma = pltUser.Yaoqingma;
+ updatepltUser.HetongDateEnd = pltUser.HetongDateEnd;
}
_context.SaveChanges();
@@ -303,6 +305,8 @@
BasicPrice = a.BasicPrice,
ShiyongPrice = a.ShiyongPrice,
ShiyongPriceName = a.ShiyongPrice.HasValue ? a.ShiyongPrice.Value.ToString("F2") : "",
+ HetongDateEnd = a.HetongDateEnd,
+ HetongDateEndName = a.HetongDateEnd.HasValue ? a.HetongDateEnd.Value.ToString("yyyy-MM-dd") : "",
ShebaodateName = a.Shebaodate.HasValue ? a.Shebaodate.Value.ToString("yyyy-MM-dd") : "",
@@ -335,7 +339,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 +351,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);
--
Gitblit v1.9.1