From 3e6a4acf8cb168ebcd2ff5aff06ace3e83bcdc8c Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 11 Aug 2022 11:17:41 +0800 Subject: [PATCH] =?UTF-8?q?Oracle=20BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/ImportCommonServiceImpl.java | 2 +- src/com/engine/organization/thread/OrganizationRunable.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 23ffbf3d..8e078bf8 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -540,7 +540,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ XSSFSheet sheetAt = workbook.getSheetAt(0); int lastRow = sheetAt.getLastRowNum(); List extendInfoPOS = new ArrayList<>(); - OrganizationAssert.isTrue(lastRow > 1, "导入数据为空"); + OrganizationAssert.isTrue(lastRow > 0, "导入数据为空"); // 遍历每一行数据 diff --git a/src/com/engine/organization/thread/OrganizationRunable.java b/src/com/engine/organization/thread/OrganizationRunable.java index 03b731b6..781c71cd 100644 --- a/src/com/engine/organization/thread/OrganizationRunable.java +++ b/src/com/engine/organization/thread/OrganizationRunable.java @@ -11,10 +11,12 @@ import com.engine.organization.enums.OperateTypeEnum; import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; +import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.relation.EcHrmRelationUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import weaver.conn.RecordSet; import weaver.general.Util; import weaver.hrm.User; @@ -432,6 +434,9 @@ public class OrganizationRunable implements Runnable { private void updateJclUUID(String id, String ecTableName, String jclTableName) { JSONObject hrmDepartment = getSystemDataMapper().getHrmObjectByID(ecTableName, id); String uuid = hrmDepartment.getString("uuid"); + if (DBType.get(new RecordSet().getDBType()).equals(DBType.ORACLE)) { + uuid = hrmDepartment.getString("UUID"); + } Map departmentMap = new HashMap<>(); departmentMap.put("uuid", uuid); long jclTableId = Long.parseLong(Util.null2String(params.get("id")));