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 | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs index 9e13482..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; } @@ -190,6 +190,7 @@ updatepltUser.jintiesalary = pltUser.jintiesalary; updatepltUser.geshuiqizheng = pltUser.geshuiqizheng; updatepltUser.Yaoqingma = pltUser.Yaoqingma; + updatepltUser.HetongDateEnd = pltUser.HetongDateEnd; } _context.SaveChanges(); @@ -304,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") : "", -- Gitblit v1.9.1