diff --git a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java
index 9aa58b539..60bba2281 100644
--- a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java
+++ b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRequest.java
@@ -76,8 +76,8 @@ public class EmployeeDeclareRequest {
             // 离职日期
             employeeInfoMap.put("lzrq", SalaryDateUtil.getFormatLocalDate(employeeDeclare.getDismissDate()));
             //是否离职后补发工资
-            SalaryOnOffEnum reissueSalary = SalaryEnumUtil.enumMatchByValue(employeeDeclare.getReissueSalary(), SalaryOnOffEnum.class);
-            employeeInfoMap.put("sflzhbfgz", reissueSalary == null ? "" : reissueSalary.getDefaultLabel());
+            SalaryOnOffEnum reissueSalary = employeeDeclare.getReissueSalary() == null ? SalaryOnOffEnum.OFF : SalaryEnumUtil.enumMatchByValue(employeeDeclare.getReissueSalary(), SalaryOnOffEnum.class);
+            employeeInfoMap.put("sflzhbfgz", (reissueSalary != null && reissueSalary == SalaryOnOffEnum.ON) ? "是" : "");
             //补发税款所属月份
             employeeInfoMap.put("bfskssyf", SalaryDateUtil.getFormatYYYYMM(employeeDeclare.getReissueTaxCycle()));
             // 是否残疾
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index 2640685f4..cd6d26811 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -1196,7 +1196,7 @@
               AND hed.tax_agent_id = #{param.taxAgentId}
               AND hed.tax_cycle = #{param.taxCycle}
               AND hed.successfully_declared = 1
-              AND (hed.employment_status = 0 OR hed.dismiss_date <![CDATA[ >= ]]> #{param.taxCycle})
+              AND (hed.dismiss_date is null  OR hed.dismiss_date <![CDATA[ >= ]]> #{param.taxCycle} OR hed.reissue_tax_cycle = #{param.taxCycle})
               AND hed.declare_status IN (4)
         )
     </select>
@@ -1214,7 +1214,7 @@
               AND hed.tax_agent_id = #{param.taxAgentId}
               AND hed.tax_cycle = #{param.taxCycle}
               AND hed.successfully_declared = 1
-              AND (hed.employment_status = 0 OR hed.dismiss_date <![CDATA[ >= ]]> #{param.taxCycle})
+              AND (hed.dismiss_date is null  OR hed.dismiss_date <![CDATA[ >= ]]> #{param.taxCycle} OR hed.reissue_tax_cycle = #{param.taxCycle})
               AND hed.declare_status IN (4)
         )
     </select>
diff --git a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml
index e2954ff45..7744bcbad 100644
--- a/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml
+++ b/src/com/engine/salary/mapper/taxdeclaration/TaxDeclarationValueMapper.xml
@@ -411,7 +411,7 @@
         AND hed.tax_agent_id = #{param.taxAgentId}
         AND hed.tax_cycle = #{param.taxCycle}
         AND hed.successfully_declared = 1
-        AND (hed.employment_status = 0 OR hed.dismiss_date <![CDATA[ >= ]]> #{param.taxCycle})
+        AND (hed.dismiss_date is null OR hed.dismiss_date <![CDATA[ >= ]]> #{param.taxCycle} OR hed.reissue_tax_cycle = #{param.taxCycle})
         AND hed.declare_status IN (4)
         )
     </sql>
@@ -432,7 +432,7 @@
         AND tax_agent_id = #{param.taxAgentId}
         AND tax_cycle = #{param.taxCycle}
         AND successfully_declared = 1
-        AND employment_status = 0
+        AND (dismiss_date is null OR dismiss_date <![CDATA[ >= ]]> #{param.taxCycle} OR reissue_tax_cycle = #{param.taxCycle})
         AND employee_id NOT IN (
         SELECT employee_id
         FROM hrsa_tax_declaration_value htdv
diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
index a9a9e2a8f..e1a88f6f6 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
@@ -141,7 +141,6 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee
 
         InputStream fileInputStream = null;
         try {
-
             fileInputStream = ImageFileManager.getInputStreamById(Integer.parseInt(param.getImageId()));
 
             Sheet sheet = ExcelSupport.parseFile(fileInputStream, 0, EXCEL_TYPE_XLSX);
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 471bc411f..304b2a206 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -8,7 +8,6 @@ import com.engine.core.impl.Service;
 import com.engine.hrmelog.entity.dto.LoggerContext;
 import com.engine.salary.config.SalaryElogConfig;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
-import com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctConfig;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO;
 import com.engine.salary.entity.salaryacct.dto.AbnormalEmployeeListDTO;
@@ -888,16 +887,6 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         queryParam.setTaxAgentId(sobPO.getTaxAgentId());
 
         List<AbnormalEmployeeListDTO> list = getSalaryAcctEmployeeMapper().listPage4NotDeclareByParam(queryParam);
-
-        if (CollUtil.isNotEmpty(list)) {
-            //补发逻辑
-            List<EmployeeDeclarePO> employeeDeclares = getEmployeeDeclareService(user).listReissueEmp(queryParam.getTaxAgentId(), queryParam.getTaxCycle());
-            if(CollUtil.isNotEmpty(employeeDeclares)){
-                Set<Long> empIds = SalaryEntityUtil.properties(employeeDeclares, EmployeeDeclarePO::getEmployeeId);
-                list = list.stream().filter(taxDeclarationValue -> !empIds.contains(taxDeclarationValue.getEmployeeId())).collect(Collectors.toList());
-            }
-        }
-
         return list;
     }
 
diff --git a/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java
index ea11d6a24..3367bc5e1 100644
--- a/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclareEmployeeServiceImpl.java
@@ -1,6 +1,5 @@
 package com.engine.salary.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
@@ -24,7 +23,10 @@ import com.engine.salary.util.page.SalaryPageUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import weaver.hrm.User;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -64,14 +66,6 @@ public class TaxDeclareEmployeeServiceImpl extends Service implements TaxDeclare
     public List<TaxDeclareEmployeePO> list4NotDeclareByParam(AbnormalEmployeeListQueryParam queryParam) {
         //根据正常/非正常状态和离职日期查询是否有未报送的人员
         List<TaxDeclareEmployeePO> list = getTaxDeclarationValueMapper().list4NotDeclareByParam(queryParam);
-        if (CollUtil.isNotEmpty(list)) {
-            //补发逻辑
-            List<EmployeeDeclarePO> employeeDeclares = getEmployeeDeclareService(user).listReissueEmp(queryParam.getTaxAgentId(), queryParam.getTaxCycle());
-            if(CollUtil.isNotEmpty(employeeDeclares)){
-                Set<Long> empIds = SalaryEntityUtil.properties(employeeDeclares, EmployeeDeclarePO::getEmployeeId);
-                list = list.stream().filter(taxDeclarationValue -> !empIds.contains(taxDeclarationValue.getEmployeeId())).collect(Collectors.toList());
-            }
-        }
         return list;
     }