From 63928ddc598d03d66abc83418d76c936dd13365f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Mon, 28 Oct 2024 15:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=BA=E5=91=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81null=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 1fd3b4970..9827dfd87 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -719,7 +719,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService MonthTypeEnum monthType = salaryBillViewingLimitSetting.getMonthType(); LocalDate localDate; if (monthType == MonthTypeEnum.SALARY_DATE) { - localDate = LocalDate.now().plusMonths(-salaryBillViewingLimitSetting.getLimitMonth()+1).withDayOfMonth(1); + localDate = LocalDate.now().plusMonths(-salaryBillViewingLimitSetting.getLimitMonth() + 1).withDayOfMonth(1); } else { localDate = LocalDate.now().plusMonths(-salaryBillViewingLimitSetting.getLimitMonth()); } @@ -1110,7 +1110,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService map.put("mobile", e.getMobile()); map.put("dissmissdate", hrmDepartmentComInfo.getDismissdate()); map.put("status", salaryAcctEmployee.getStatus()); - map.put("statusName", UserStatusEnum.getDefaultLabelByValue(Integer.valueOf(salaryAcctEmployee.getStatus()))); + map.put("statusName", UserStatusEnum.getDefaultLabelByValue(NumberUtils.toInt(salaryAcctEmployee.getStatus(), 1))); map.put("workcode", hrmDepartmentComInfo.getWorkcode()); map.put("sex", "0".equals(hrmDepartmentComInfo.getSex()) ? "男" : "女"); map.put("idNo", hrmDepartmentComInfo.getIdNo());