From 3ad40774dd9cb895bfa46bc5e85334209d5b2f21 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 21 Oct 2022 10:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88,=E7=BC=96=E8=BE=91=E6=A0=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BAnull=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/siarchives/bo/InsuranceArchivesBO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java index ce88f5e9b..f985e04f1 100644 --- a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java +++ b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java @@ -34,7 +34,7 @@ public class InsuranceArchivesBO { .socialStartTime(po.getSocialStartTime()) .schemeAccount(po.getSocialAccount()) .schemePaymentBaseString(po.getSocialPaymentBaseString()) - .underTake(po.getUnderTake() + "") + .underTake(po.getUnderTake() == null ? null : String.valueOf(po.getUnderTake())) .build(); } @@ -54,7 +54,7 @@ public class InsuranceArchivesBO { .fundStartTime(po.getFundStartTime()) .supplementFundAccount(po.getSupplementFundAccount()) .nonPayment(po.getNonPayment()) - .underTake(po.getUnderTake() + "") + .underTake(po.getUnderTake() == null ? null : String.valueOf(po.getUnderTake())) .welfareType(SalaryEnumUtil.enumMatchByValue(po.getWelfareType(), WelfareTypeEnum.values(), WelfareTypeEnum.class)) .build(); } @@ -66,7 +66,7 @@ public class InsuranceArchivesBO { return InsuranceArchivesOtherSchemeDTO.builder() .id(po.getId()) .employeeId(po.getEmployeeId()) - .underTake(po.getUnderTake() + "") + .underTake(po.getUnderTake() == null ? null : String.valueOf(po.getUnderTake())) .nonPayment(po.getNonPayment()) .otherName(po.getOtherSchemeId() == null ? null : String.valueOf(po.getOtherSchemeId())) .otherSchemeId(po.getOtherSchemeId())