From 54d8f3ef3916f5141d6fc24a8c49d70cf91c0323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 5 Dec 2023 17:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=A0=E6=B3=95=E7=BD=AE=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/employeedeclare/EmployeeDeclareMapper.xml | 6 ++----
 .../salary/service/impl/EmployeeDeclareServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareMapper.xml b/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareMapper.xml
index 5f8eab4af..890181735 100644
--- a/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareMapper.xml
+++ b/src/com/engine/salary/mapper/employeedeclare/EmployeeDeclareMapper.xml
@@ -639,7 +639,7 @@
             )
         </foreach>
     </insert>
-    
+
 
     <!-- 更新,更新全部字段 -->
     <update id="update" parameterType="com.engine.salary.entity.employeedeclare.po.EmployeeDeclarePO">
@@ -730,9 +730,7 @@
             <if test="employmentDate != null">
                 employment_date=#{employmentDate},
             </if>
-            <if test="dismissDate != null">
-                dismiss_date=#{dismissDate},
-            </if>
+            dismiss_date=#{dismissDate},
             <if test="disability != null">
                 disability=#{disability},
             </if>
diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
index eea830dcc..fbb34e775 100644
--- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
+++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java
@@ -250,7 +250,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
             if (!StringUtils.equals(employeeDeclare.toCompareString(), originEmployeeDeclare.toCompareString())) {
                 employeeDeclare.setNewEmployeeInfo(1);
             }
-            getEmployeeDeclareMapper().updateIgnoreNull(employeeDeclare);
+            getEmployeeDeclareMapper().update(employeeDeclare);
             // 记录日志
 //            LoggerContext<EmployeeDeclarePO> loggerContext = new LoggerContext<>();
 //            loggerContext.setTargetId(Util.null2String(saveParam.getTaxAgentId()));