From 7f51135424b0c5aec319f73d7e6fa5c109e63d1c Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Wed, 14 Dec 2022 17:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/version/HrmDepartmentVersion.java         | 12 ++++++------
 .../organization/mapper/jclorgmap/JclOrgMapper.xml   |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/organization/entity/version/HrmDepartmentVersion.java b/src/com/engine/organization/entity/version/HrmDepartmentVersion.java
index 9435263b..e16cde7a 100644
--- a/src/com/engine/organization/entity/version/HrmDepartmentVersion.java
+++ b/src/com/engine/organization/entity/version/HrmDepartmentVersion.java
@@ -8,15 +8,15 @@ import java.util.Date;
 public class HrmDepartmentVersion {
 
     int  id;
-    int  departmentId;
+    Integer  departmentId;
     String departmentMark;
     String departmentCode;
     String departmentName;
-    int subCompanyId1;
-    int supDepId;
-    int bmfzr;
-    int showOrder;
-    int canceled;
+    Integer subCompanyId1;
+    Integer supDepId;
+    Integer bmfzr;
+    Integer showOrder;
+    Integer canceled;
     String description;
     String operator;
     Double version;
diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
index 3a9cd68e..ba7028af 100644
--- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
+++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
@@ -59,8 +59,12 @@
     <update id="updateMapById">
         update jcl_org_map
         <set>
-            fplan=#{fplan},
-            fonjob=#{fonjob},
+            <if test="fplan != null">
+                fplan=#{fplan},
+            </if>
+            <if test="fonjob != null">
+                fonjob=#{fonjob},
+            </if>
         </set>
         where id=#{id}
         AND FDATEBEGIN &lt;= #{currentDate}