diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
index d436117c1..7f09f2048 100644
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
@@ -78,7 +78,7 @@ public class SalaryTemplateBO {
                 .autoSendDayOfMonth(saveParam.getAutoSendDayOfMonth())
                 .autoSendTimeOfDay(saveParam.getAutoSendTimeOfDay())
                 .ackFeedbackStatus(saveParam.getAckFeedbackStatus()?1:0)
-                .ackFeedbackStatus(saveParam.getFeedbackStatus()?1:0)
+                .feedbackStatus(saveParam.getFeedbackStatus()?1:0)
                 .autoAckDays(saveParam.getAutoAckDays())
                 .feedbackUrl(saveParam.getFeedbackUrl())
                 .mobileFeedbackUrl(saveParam.getMobileFeedbackUrl())
diff --git a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
index 581b8f20d..63d0b5138 100644
--- a/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
@@ -97,7 +97,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
         SalaryBillAckFeedbackDTO ackFeedbackSetting = saveParam.getAckFeedbackSetting();
         // 1.保存确认反馈开关状态
         getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK, "工资单确认状态", "billSend");
-        getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend");
+        getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedbackStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend");
         if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) {
             // 保存自动确认时间
             getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend");
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index fb68130fb..a14d01c5c 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -866,10 +866,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
                 .replenishSalaryItemSetting(map.getOrDefault("replenishSalaryItemSetting", "").toString())
                 .build();
         Object feedbackStatus = map.get("feedbackStatus");
-        if (feedbackStatus == null) {
+        if (feedbackStatus == null || StringUtils.isBlank(feedbackStatus.toString())) {
             build.setFeedbackStatus(build.getAckFeedbackStatus());
         } else {
-            Integer.valueOf(map.get("ackFeedbackStatus").toString());
+            build.setFeedbackStatus(Integer.valueOf(feedbackStatus.toString()));
         }
         return build;
     }
diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
index 9243eced6..6e19ffbd2 100644
--- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
@@ -215,7 +215,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate
         salaryTemplateNew.setAutoSendStatus(saveParam.getAutoSendStatus() ? 1 : 0);
         salaryTemplateNew.setAutoSendCycleType(saveParam.getAutoSendCycleType());
         salaryTemplateNew.setAckFeedbackStatus(saveParam.getAckFeedbackStatus() ? 1 : 0);
-        salaryTemplateNew.setAckFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0);
+        salaryTemplateNew.setFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0);
         salaryTemplateNew.setAutoAckDays(saveParam.getAutoAckDays());
         salaryTemplateNew.setFeedbackUrl(saveParam.getFeedbackUrl());
         salaryTemplateNew.setMobileFeedbackUrl(saveParam.getMobileFeedbackUrl());
diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
index c4b622c69..a1d36cdea 100644
--- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
@@ -169,7 +169,7 @@ public class SalaryTemplateWrapper extends Service {
             if (po.getFeedbackStatus() == null) {
                 salaryTemplateBaseSetDTO.setFeedbackStatus(salaryTemplateBaseSetDTO.getAckFeedbackStatus());
             } else {
-                salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 0);
+                salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getFeedbackStatus(), 1) == 0);
             }
 
             salaryTemplateBaseSetDTO.setAutoAckDays(ObjectUtils.isEmpty(po.getAutoAckDays()) ? 7 : po.getAutoAckDays());