calculator3

server/service/staff_salary.go

@@ -67,6 +67,14 @@ func (s *StaffSalary) Create(sess *session.AdminSession, req *api.CreateSalaryRe
 	session.CheckDBError(err)
 
 	for _, user := range users {
+		//离职的且离职时间不在当月的不在计算工资
+		if user.Status == model.StaffUserStatusOffline {
+			leaveDate, _ := time.ParseInLocation("2006-01-02", user.LeaveDate, time.Local)
+			if leaveDate.Month() != time.Now().Month() {
+				continue
+			}
+		}
+
 		salary, err := dao.NewStaffSalaryDao().GetBy(sess.GetCorpId(), user.Id, req.Month)
 		session.CheckDBError(err)
 		salaryServ := CommonService.NewStaffSalary(user)