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;