From c64e9b4b7622fb32aa1a4829243c9cfe7a9a70ca Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Mon, 19 Feb 2024 14:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E5=8D=95=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/sqlupgrade/DM/sql202402190103.sql                    | 3 +++
 resource/sqlupgrade/GS/sql202402190103.sql                    | 3 +++
 resource/sqlupgrade/JC/sql202402190103.sql                    | 3 +++
 resource/sqlupgrade/Mysql/sql202402190103.sql                 | 1 +
 resource/sqlupgrade/Oracle/sql202402190103.sql                | 2 ++
 resource/sqlupgrade/PG/sql202402190103.sql                    | 1 +
 resource/sqlupgrade/SQLServer/sql202402190103.sql             | 2 ++
 resource/sqlupgrade/ST/sql202402190103.sql                    | 3 +++
 src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 4 +++-
 9 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 resource/sqlupgrade/DM/sql202402190103.sql
 create mode 100644 resource/sqlupgrade/GS/sql202402190103.sql
 create mode 100644 resource/sqlupgrade/JC/sql202402190103.sql
 create mode 100644 resource/sqlupgrade/Mysql/sql202402190103.sql
 create mode 100644 resource/sqlupgrade/Oracle/sql202402190103.sql
 create mode 100644 resource/sqlupgrade/PG/sql202402190103.sql
 create mode 100644 resource/sqlupgrade/SQLServer/sql202402190103.sql
 create mode 100644 resource/sqlupgrade/ST/sql202402190103.sql

diff --git a/resource/sqlupgrade/DM/sql202402190103.sql b/resource/sqlupgrade/DM/sql202402190103.sql
new file mode 100644
index 000000000..ee754d9b3
--- /dev/null
+++ b/resource/sqlupgrade/DM/sql202402190103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_template add feedback_status int;
+/
+
diff --git a/resource/sqlupgrade/GS/sql202402190103.sql b/resource/sqlupgrade/GS/sql202402190103.sql
new file mode 100644
index 000000000..ee754d9b3
--- /dev/null
+++ b/resource/sqlupgrade/GS/sql202402190103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_template add feedback_status int;
+/
+
diff --git a/resource/sqlupgrade/JC/sql202402190103.sql b/resource/sqlupgrade/JC/sql202402190103.sql
new file mode 100644
index 000000000..ee754d9b3
--- /dev/null
+++ b/resource/sqlupgrade/JC/sql202402190103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_template add feedback_status int;
+/
+
diff --git a/resource/sqlupgrade/Mysql/sql202402190103.sql b/resource/sqlupgrade/Mysql/sql202402190103.sql
new file mode 100644
index 000000000..e4806b3ec
--- /dev/null
+++ b/resource/sqlupgrade/Mysql/sql202402190103.sql
@@ -0,0 +1 @@
+alter table hrsa_salary_template add feedback_status int;
\ No newline at end of file
diff --git a/resource/sqlupgrade/Oracle/sql202402190103.sql b/resource/sqlupgrade/Oracle/sql202402190103.sql
new file mode 100644
index 000000000..a45fcae76
--- /dev/null
+++ b/resource/sqlupgrade/Oracle/sql202402190103.sql
@@ -0,0 +1,2 @@
+alter table hrsa_salary_template add feedback_status int
+/
\ No newline at end of file
diff --git a/resource/sqlupgrade/PG/sql202402190103.sql b/resource/sqlupgrade/PG/sql202402190103.sql
new file mode 100644
index 000000000..e4806b3ec
--- /dev/null
+++ b/resource/sqlupgrade/PG/sql202402190103.sql
@@ -0,0 +1 @@
+alter table hrsa_salary_template add feedback_status int;
\ No newline at end of file
diff --git a/resource/sqlupgrade/SQLServer/sql202402190103.sql b/resource/sqlupgrade/SQLServer/sql202402190103.sql
new file mode 100644
index 000000000..b00318264
--- /dev/null
+++ b/resource/sqlupgrade/SQLServer/sql202402190103.sql
@@ -0,0 +1,2 @@
+alter table hrsa_salary_template add feedback_status int
+go
\ No newline at end of file
diff --git a/resource/sqlupgrade/ST/sql202402190103.sql b/resource/sqlupgrade/ST/sql202402190103.sql
new file mode 100644
index 000000000..ee754d9b3
--- /dev/null
+++ b/resource/sqlupgrade/ST/sql202402190103.sql
@@ -0,0 +1,3 @@
+alter table hrsa_salary_template add feedback_status int;
+/
+
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index a14d01c5c..67041985d 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -725,7 +725,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
             throw new SalaryRunTimeException("请先设置工资单模板");
         }
         Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
-        if (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0) {
+        Integer feedbackStatus = salaryTemplates.get(0).getFeedbackStatus();
+        if ( (ackFeedbackStatus != null && NumberUtils.compare(ackFeedbackStatus, 1) == 0)
+                || (feedbackStatus != null && NumberUtils.compare(feedbackStatus, 1) == 0)) {
             // 默认为空时，未读未确认
             pageInfo.getList().stream().forEach(obj -> {
                 SalarySendInfoListDTO dto = (SalarySendInfoListDTO) obj;