From 3f6b549789c882e4530f3031e9f9b43615a9e021 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 2 Nov 2022 20:08:04 +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=A8=A1=E5=9D=97=E5=9F=BA=E6=95=B0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java | 2 +- .../entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java index a9f008c97..a96b96aad 100644 --- a/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java +++ b/src/com/engine/salary/entity/siarchives/bo/InsuranceArchivesBO.java @@ -25,7 +25,7 @@ public class InsuranceArchivesBO { } return InsuranceArchivesSocialSchemeDTO.builder() .socialName(po.getSocialSchemeId() == null ? null : String.valueOf(po.getSocialSchemeId())) - .socialSchemeId(po.getSocialSchemeId() == null ? null : String.valueOf(po.getSocialSchemeId())) + .socialSchemeId(po.getSocialSchemeId()) .welfareType(SalaryEnumUtil.enumMatchByValue(po.getWelfareType(), WelfareTypeEnum.values(), WelfareTypeEnum.class)) .id(po.getId()) .employeeId(po.getEmployeeId()) diff --git a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java index 24a46fd30..1be1afbca 100644 --- a/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java +++ b/src/com/engine/salary/entity/siarchives/dto/InsuranceArchivesSocialSchemeDTO.java @@ -41,7 +41,7 @@ public class InsuranceArchivesSocialSchemeDTO { private String socialName; //社保方案id - private String socialSchemeId; + private Long socialSchemeId; //private List siSocialList;