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 jcl_org_map - fplan=#{fplan}, - fonjob=#{fonjob}, + + fplan=#{fplan}, + + + fonjob=#{fonjob}, + where id=#{id} AND FDATEBEGIN <= #{currentDate}