diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareOptServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareOptServiceImpl.java
index 1f45587f5..15ac91be2 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareOptServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareOptServiceImpl.java
@@ -42,6 +42,7 @@ public class EmployeeDeclareOptServiceImpl extends Service implements EmployeeDe
             po = EmployeeDeclareOptPO.builder()
                     .id(IdGenerator.generate())
                     .taxAgentId(taxAgentId)
+                    .taxCycle(po.getTaxCycle())
                     .status(po.getStatus())
                     .lastOperate(po.getLastOperate())
                     .lastOperateTime(now)
@@ -53,6 +54,7 @@ public class EmployeeDeclareOptServiceImpl extends Service implements EmployeeDe
                     .build();
             getEmployeeDeclareOptMapper().insertIgnoreNull(po);
         }else {
+            po.setTaxCycle(po.getTaxCycle());
             optPO.setStatus(po.getStatus());
             optPO.setLastOperate(po.getLastOperate());
             optPO.setLastOperateTime(now);
diff --git a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java
index 9782a0c00..3774e431d 100644
--- a/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java
+++ b/src/com/engine/salary/wrapper/EmployeeDeclareWrapper.java
@@ -39,6 +39,7 @@ import com.weaver.util.threadPool.entity.LocalRunnable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import weaver.general.Util;
 import weaver.hrm.User;
 
 import java.util.*;
@@ -106,8 +107,6 @@ public class EmployeeDeclareWrapper extends Service {
         List<String> statuses = queryParam.getStatuses();
         EmployeeDeclareOptPO declareOptPO = EmployeeDeclareOptPO.builder()
                 .taxAgentIds(SalaryEntityUtil.properties(taxAgents, TaxAgentPO::getId))
-                .lastOperates(lastOperates)
-                .statuses(statuses)
                 .build();
         List<EmployeeDeclareOptPO> employeeDeclareOptPOS = getEmployeeDeclareOptService(user).listSome(declareOptPO);
         Map<Long, EmployeeDeclareOptPO> longEmployeeDeclareOptPOMap = SalaryEntityUtil.convert2Map(employeeDeclareOptPOS, EmployeeDeclareOptPO::getTaxAgentId);
@@ -121,19 +120,19 @@ public class EmployeeDeclareWrapper extends Service {
             optPO = optPO == null ? new EmployeeDeclareOptPO() : optPO;
             Date taxCycle = optPO.getTaxCycle();
             EmployeeDeclareInfoDTO declareInfo = getDeclareInfo(EmployeeDeclareParam.builder().taxAgentId(taxAgent.getId()).taxCycle(taxCycle).build());
-            String status;
+            DeclareStatusEnum status;
             if (declareInfo.getNotDeclareSize() > 0) {
-                status = DeclareStatusEnum.NOT_DECLARE.getDefaultLabel();
+                status = DeclareStatusEnum.NOT_DECLARE;
             } else if (declareInfo.getDeclareFailSize() > 0) {
-                status = DeclareStatusEnum.DECLARE_FAIL.getDefaultLabel();
+                status = DeclareStatusEnum.DECLARE_FAIL;
             } else {
-                status = DeclareStatusEnum.DECLARE_SUCCESS.getDefaultLabel();
+                status = DeclareStatusEnum.DECLARE_SUCCESS;
             }
 
             TaxAgentDeclareListDTO dto = TaxAgentDeclareListDTO.builder()
                     .id(taxAgent.getId())
                     .taxAgentName(taxAgent.getName())
-                    .status(status)
+                    .status(status.getDefaultLabel())
                     .lastOperate(DeclareOptEnum.getByValue(optPO.getLastOperate()).getDefaultLabel())
                     .lastOperateTime(optPO.getLastOperateTime())
                     .opts(Sets.newHashSet("admin"))
@@ -143,7 +142,7 @@ public class EmployeeDeclareWrapper extends Service {
             if (CollUtil.isNotEmpty(lastOperates) && !lastOperates.contains(optPO.getLastOperate())) {
                 continue;
             }
-            if (CollUtil.isNotEmpty(statuses) && !statuses.contains(status)) {
+            if (CollUtil.isNotEmpty(statuses) && !statuses.contains(Util.null2String(status.getValue()))) {
                 continue;
             }