From beb706170795deae86f66bca72f3ae27ff1b5a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 18 Apr 2022 15:45:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/formula/FormulaMapper.xml   | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/com/engine/salary/mapper/formula/FormulaMapper.xml b/src/com/engine/salary/mapper/formula/FormulaMapper.xml
index 1c6ad932d..131bb9a47 100644
--- a/src/com/engine/salary/mapper/formula/FormulaMapper.xml
+++ b/src/com/engine/salary/mapper/formula/FormulaMapper.xml
@@ -151,6 +151,9 @@
             <if test="formula != null">
                 formula,
             </if>
+            <if test="formulaRunScript != null">
+                formulaRunScript,
+            </if>
             <if test="creator != null">
                 creator,
             </if>
@@ -195,6 +198,9 @@
             <if test="formula != null">
                 #{formula},
             </if>
+            <if test="formulaRunScript != null">
+                #{formulaRunScript},
+            </if>
             <if test="creator != null">
                 #{creator},
             </if>
@@ -210,30 +216,9 @@
         </trim>
     </insert>
 
-    <!-- 更新,更新全部字段 -->
-    <update id="update" parameterType="com.engine.salary.entity.salaryformula.po.FormulaPO">
-        UPDATE hrsa_formula
-        <set>
-            name=#{name},
-            description=#{description},
-            module=#{module},
-            use_for=#{useFor},
-            reference_type=#{referenceType},
-            return_type=#{returnType},
-            validate_type=#{validateType},
-            extend_param=#{extendParam},
-            formula=#{formula},
-            creator=#{creator},
-            delete_type=#{deleteType},
-            create_time=#{createTime},
-            update_time=#{updateTime},
-        </set>
-        WHERE id = #{id} AND delete_type = 0
-    </update>
-
 
     <!-- 更新不为NULL的字段 -->
-    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryformula.po.FormulaPO">
+    <update id="updateIgnoreNull" parameterType="com.engine.salary.entity.Formula">
         UPDATE hrsa_formula
         <set>
             <if test="name != null">
@@ -263,6 +248,9 @@
             <if test="formula != null">
                 formula=#{formula},
             </if>
+            <if test="formulaRunScript != null">
+                formulaRunScript=#{formulaRunScript},
+            </if>
             <if test="creator != null">
                 creator=#{creator},
             </if>