liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oracle BUG修复

This commit is contained in:
dxfeng 2022-08-11 11:17:41 +08:00
parent f27612db94
commit 3e6a4acf8c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
View File

@ -540,7 +540,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
XSSFSheet sheetAt = workbook.getSheetAt(0); XSSFSheet sheetAt = workbook.getSheetAt(0);
int lastRow = sheetAt.getLastRowNum(); int lastRow = sheetAt.getLastRowNum();
List<ExtendInfoPO> extendInfoPOS = new ArrayList<>(); List<ExtendInfoPO> extendInfoPOS = new ArrayList<>();
OrganizationAssert.isTrue(lastRow > 1, "导入数据为空"); OrganizationAssert.isTrue(lastRow > 0, "导入数据为空");
// 遍历每一行数据 // 遍历每一行数据

5
src/com/engine/organization/thread/OrganizationRunable.java
View File

@ -11,10 +11,12 @@ import com.engine.organization.enums.OperateTypeEnum;
import com.engine.organization.mapper.extend.ExtMapper; import com.engine.organization.mapper.extend.ExtMapper;
import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper;
import com.engine.organization.mapper.job.JobMapper; 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.db.MapperProxyFactory;
import com.engine.organization.util.relation.EcHrmRelationUtil; import com.engine.organization.util.relation.EcHrmRelationUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import weaver.conn.RecordSet;
import weaver.general.Util; import weaver.general.Util;
import weaver.hrm.User; import weaver.hrm.User;
@ -432,6 +434,9 @@ public class OrganizationRunable implements Runnable {
private void updateJclUUID(String id, String ecTableName, String jclTableName) { private void updateJclUUID(String id, String ecTableName, String jclTableName) {
JSONObject hrmDepartment = getSystemDataMapper().getHrmObjectByID(ecTableName, id); JSONObject hrmDepartment = getSystemDataMapper().getHrmObjectByID(ecTableName, id);
String uuid = hrmDepartment.getString("uuid"); String uuid = hrmDepartment.getString("uuid");
if (DBType.get(new RecordSet().getDBType()).equals(DBType.ORACLE)) {
uuid = hrmDepartment.getString("UUID");
}
Map<String, Object> departmentMap = new HashMap<>(); Map<String, Object> departmentMap = new HashMap<>();
departmentMap.put("uuid", uuid); departmentMap.put("uuid", uuid);
long jclTableId = Long.parseLong(Util.null2String(params.get("id"))); long jclTableId = Long.parseLong(Util.null2String(params.get("id")));