diff --git a/src/com/engine/organization/entity/jclimport/po/HrmFormFieldPO.java b/src/com/engine/organization/entity/jclimport/po/HrmFormFieldPO.java
index d32a8d19..83cc0390 100644
--- a/src/com/engine/organization/entity/jclimport/po/HrmFormFieldPO.java
+++ b/src/com/engine/organization/entity/jclimport/po/HrmFormFieldPO.java
@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.json.JSONException;
import org.json.JSONObject;
+import weaver.general.Util;
/**
* @author:dxfeng
@@ -29,10 +30,10 @@ public class HrmFormFieldPO {
public JSONObject getJsonObject(String fieldValue) throws JSONException {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("fieldid", this.fieldId);
- jsonObject.put("fieldhtmltype", this.fieldHtmlType);
- jsonObject.put("type", this.type);
- jsonObject.put("dmlurl", this.dmlUrl);
+ jsonObject.put("fieldid", Util.null2String(this.fieldId));
+ jsonObject.put("fieldhtmltype", Util.null2String(this.fieldHtmlType));
+ jsonObject.put("type", Util.null2String(this.type));
+ jsonObject.put("dmlurl", Util.null2String(this.dmlUrl));
jsonObject.put("fieldvalue", fieldValue);
return jsonObject;
}
diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.java b/src/com/engine/organization/mapper/department/DepartmentMapper.java
index 2d11b779..92822914 100644
--- a/src/com/engine/organization/mapper/department/DepartmentMapper.java
+++ b/src/com/engine/organization/mapper/department/DepartmentMapper.java
@@ -94,4 +94,6 @@ public interface DepartmentMapper {
int countUsedInJob(@Param("supDepId") Long supDepId);
+ String getIdByDepartmentCode(@Param("departmentCode") String departmentCode);
+
}
diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml
index c6dd62fa..4b6d195e 100644
--- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml
+++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml
@@ -139,6 +139,11 @@
and delete_type = 0
and parent_dept = = #{supDepId}
+
diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
index f212d21a..f0383420 100644
--- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
@@ -43,6 +43,7 @@ import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.excel.ExcelUtil;
import com.engine.organization.util.saveimport.CompanyImport;
+import com.engine.organization.util.saveimport.DepartmentImport;
import com.engine.organization.util.saveimport.OrgImportUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -74,14 +75,10 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
/**
* extend_group
*/
- private static final Long COMPANY_TYPE = 1L;
- private static final Long DEPARTMENT_TYPE = 2L;
private static final Long JOB_TYPE = 3L;
private static final Long RESOURCE_TYPE = 4L;
private static final String RIGHT_NAME = "DataImport:All";
- private static final String HRM_COMPANY = "hrmsubcompany";
- private static final String HRM_DEPARTMENT = "hrmdepartment";
private static final String HRM_RESOURCE = "hrmresource";
static Map importFieldsMap;
@@ -126,11 +123,10 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
excludeFields.add("subshowid");
return CompanyImport.getImportFields(user, excludeFields);
case "department":
- extendType = "2";
- tableName = "JCL_ORG_DEPT";
- excludeFields.add("parent_dept");
- excludeFields.add("ec_department");
- break;
+ excludeFields.add("departmentname");
+ excludeFields.add("supdepid");
+ excludeFields.add("showid");
+ return DepartmentImport.getImportFields(user, excludeFields);
case "jobtitle":
extendType = "3";
tableName = "JCL_ORG_JOB";
@@ -202,7 +198,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
returnMap.put("condition", CompanyImport.importForm(user, templatePath));
break;
case "department":
- returnMap.put("condition", getDepartmentImportForm(templatePath));
+ returnMap.put("condition", DepartmentImport.importForm(user, templatePath));
break;
case "jobtitle":
returnMap.put("condition", getJobTitleImportForm(templatePath));
@@ -238,11 +234,10 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
if (StringUtils.isNotBlank(importType)) {
switch (importType) {
case "company":
- // returnMap.put("pId", companyImport(operateType, excelFile));
returnMap.put("pId", CompanyImport.saveImport(operateType, excelFile, user));
break;
case "department":
- returnMap.put("pId", departmentImport(operateType, excelFile));
+ returnMap.put("pId", DepartmentImport.saveImport(operateType, excelFile, user));
break;
case "jobtitle":
returnMap.put("pId", jobImport(operateType, excelFile));
@@ -305,69 +300,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
}
-
- private List