From eb1966b703befc50f49953485c2f0c9dc09743aa Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Tue, 12 Sep 2023 11:21:48 +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=EF=BC=8C=E7=BC=96=E8=BE=91=E5=90=8E?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=BA=BA=E5=91=98=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E9=9D=9E=E7=B3=BB=E7=BB=9F=E4=BA=BA=E5=91=98=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index 07a965ef7..c03ef2a39 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -694,7 +694,7 @@ public class SIArchivesBiz {
                 otherSchemeMapper.updateById(updateOtherInfo);
                 //更新base_info表状态
                 InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId());
-                if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                     //对于非系统人员，编辑后状态切换为正在缴纳
                     baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
@@ -738,7 +738,7 @@ public class SIArchivesBiz {
                             .build());
                     baseInfoPO.setOtherArchivesId(otherInfos.get(0).getId());
                     //对于非系统人员，编辑后状态切换为正在缴纳
-                    if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                    if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                         baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
                     }
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
@@ -804,7 +804,7 @@ public class SIArchivesBiz {
                 fundSchemeMapper.updateById(updateFundInfo);
                 //更新base_info表状态
                 InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId());
-                if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                     //对于非系统人员，编辑后状态切换为正在缴纳
                     baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
@@ -850,7 +850,7 @@ public class SIArchivesBiz {
                             .build());
                     baseInfoPO.setFundArchivesId(fundInfos.get(0).getId());
                     //对于非系统人员，编辑后状态切换为正在缴纳
-                    if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                    if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                         baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
                     }
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
@@ -923,7 +923,7 @@ public class SIArchivesBiz {
                 socialSchemeMapper.updateById(updateSocialInfo);
                 //更新base_info表状态
                 InsuranceArchivesBaseInfoPO baseInfoPO = getInsuranceBaseInfoMapper().getOneByEmployeeIdAndPayOrg(param.getPaymentOrganization(), param.getEmployeeId());
-                if(baseInfoPO != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                     //对于非系统人员，编辑后状态切换为正在缴纳
                     baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);
@@ -969,7 +969,7 @@ public class SIArchivesBiz {
                             .build());
                     baseInfoPO.setSocialArchivesId(socialInfos.get(0).getId());
                     //对于非系统人员，编辑后状态切换为正在缴纳
-                    if (baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
+                    if (baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                         baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
                     }
                     getInsuranceBaseInfoMapper().updateById(baseInfoPO);