!190 BUG修复

Merge pull request !190 from dxfeng/feature/dxf

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<ExtendInfoPO> extendInfoPOS = new ArrayList<>();
-        OrganizationAssert.isTrue(lastRow > 1, "导入数据为空");
+        OrganizationAssert.isTrue(lastRow > 0, "导入数据为空");
 
 
         // 遍历每一行数据

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<String, Object> departmentMap = new HashMap<>();
         departmentMap.put("uuid", uuid);
         long jclTableId = Long.parseLong(Util.null2String(params.get("id")));