From ee9697a4ada43a1a728ff5c5febe13fa02d97ee1 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Tue, 25 Jul 2023 18:27:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsql=E4=B8=ADunion?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AD=97=E7=AC=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/SalaryFormulaServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
index d1856b6c7..401a761d7 100644
--- a/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
@@ -138,6 +138,8 @@ public class SalaryFormulaServiceImpl extends Service implements SalaryFormulaSe
         param.setFormula(param.getFormula().replaceAll("ＥＸＩＳＴＳ", "EXISTS"));
         param.setFormula(param.getFormula().replaceAll("ｂｅｔｗｅｅｎ", "between"));
         param.setFormula(param.getFormula().replaceAll("ＢＥＴＷＥＥＮ", "BETWEEN"));
+        param.setFormula(param.getFormula().replaceAll("ｕｎｉｏｎ", "union"));
+        param.setFormula(param.getFormula().replaceAll("ＵＮＩＯＮ", "UNION"));
 
         // 解析公式中的参数
         if (ReferenceTypeEnum.parseByValue(param.getReferenceType()) == ReferenceTypeEnum.FORMULA) {

From f5b70764d3b56fcd95e6021cce883ac9af69f27d Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 26 Jul 2023 17:44:41 +0800
Subject: [PATCH 2/4] fix

---
 .../engine/salary/mapper/salarybill/SalarySendInfoMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index 7d4001131..1a4e5f2a7 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -734,7 +734,7 @@
 
 
     <!-- 更新不为NULL的字段 -->
-    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryitem.po.SalaryItemPO">
+    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalarySendInfoPO">
         UPDATE hrsa_salary_send_info
         <set>
             <if test="salarySendId != null">

From 36f6a457cf2528b61147e111ebbcab88d20182d5 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 26 Jul 2023 17:53:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/mapper/salarybill/SalarySendInfoMapper.xml  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index e5f64958f..10a004d88 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -752,9 +752,7 @@
             <if test="salaryMonth != null">
                 salary_month=#{salaryMonth},
             </if>
-            <if test="useType != null">
-                use_type=#{useType},
-            </if>
+
             <if test="salaryAcctRecordId != null">
                 salary_acct_record_id=#{salaryAcctRecordId},
             </if>

From ed99e186e137139e8c839ae9396ff0dc70e6cc65 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 26 Jul 2023 17:56:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
index 10a004d88..0895b3560 100644
--- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
+++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
@@ -752,7 +752,6 @@
             <if test="salaryMonth != null">
                 salary_month=#{salaryMonth},
             </if>
-
             <if test="salaryAcctRecordId != null">
                 salary_acct_record_id=#{salaryAcctRecordId},
             </if>