From dc3bd34e0f8d9ec3d0c4299ee14fa61fe6f4a27c Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Sat, 14 Jan 2023 13:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E5=9B=9E=E7=AE=97sendStatus?=
 =?UTF-8?q?=E5=80=BCupdate=E6=BC=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/mapper/salarybill/SalarySendMapper.xml    | 3 +++
 .../engine/salary/service/impl/SalarySendServiceImpl.java   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
index 1e91d8aa8..b13eec8ce 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendMapper.xml
@@ -131,6 +131,9 @@
             <if test="tenantKey != null">
                 tenant_key=#{tenantKey},
             </if>
+            <if test="sendStatus != null">
+                send_status=#{sendStatus},
+            </if>
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index 65f42def6..2d9ca3a06 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -803,13 +803,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
         }
 
         SalarySendPO salarySend = mapper.getById(salarySendId);
+        if (salarySend == null) {
+            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100512, "工资单发放不存在"));
+        }
         // 已经冻结不能操作
         if (Objects.equals(salarySend.getSendStatus() , NumberUtils.INTEGER_ONE)) {
             throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "工资单已冻结"));
         }
-        if (salarySend == null) {
-            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100512, "工资单发放不存在"));
-        }
         // 获取默认模板
         List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySend.getSalarySobId()));
         if (CollectionUtils.isEmpty(salaryTemplates)) {