From c56539b0d776feb5ea7aacb6be70801d13c54916 Mon Sep 17 00:00:00 2001 From: jiangyong27 Date: Fri, 14 Mar 2025 18:52:56 +0800 Subject: [PATCH] OfficialDate --- server/service/staff_user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/service/staff_user.go b/server/service/staff_user.go index 8613b60..c622e5a 100644 --- a/server/service/staff_user.go +++ b/server/service/staff_user.go @@ -135,8 +135,8 @@ func (s *StaffUser) Update(sess *session.AdminSession, req *api.StaffUpdateReq) staffUser.Realname = goutil.If(req.Realname != "", req.Realname, staffUser.Realname) staffUser.Phone = goutil.If(req.Phone != "", req.Phone, staffUser.Phone) staffUser.Idno = goutil.If(req.Idno != "", req.Idno, staffUser.Idno) - staffUser.EntryDate = goutil.If(req.EntryDate != "", req.EntryDate, staffUser.EntryDate) - staffUser.OfficialDate = goutil.If(req.OfficialDate != "", req.OfficialDate, staffUser.OfficialDate) + staffUser.EntryDate = goutil.If(req.EntryDate != "" && req.EntryDate != "NaN-NaN-NaN", req.EntryDate, staffUser.EntryDate) + staffUser.OfficialDate = goutil.If(req.OfficialDate != "" && req.OfficialDate != "NaN-NaN-NaN", req.OfficialDate, staffUser.OfficialDate) staffSalary := staffUser.GetSalary() staffSalary.Base = goutil.If(req.SalaryBase != "", req.SalaryBase, staffSalary.Base)