Merge pull request '人员批量导入 BUG修复' (#162) from feature/dxf into develop

Reviewed-on: #162

src/com/engine/organization/service/impl/ImportCommonServiceImpl.java

@@ -796,6 +796,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                 departmentColumn = column;
                 iterator.remove();
             }
+            if ("joblevel".equals(importType)) {
                 if ("方案编号".equals(column)) {
                     schemeList.add(column);
                     levelList.add(column);
@@ -827,6 +828,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                     gradeList.add(column);
                 }
             }
+        }
         if (StringUtils.isNotBlank(departmentColumn.toString())) {
             columnList.add(0, departmentColumn);
         }

src/com/engine/organization/util/saveimport/ResourceImport.java

@@ -57,6 +57,9 @@ public class ResourceImport {
                 hfm.getCustomFields();
                 while (hfm.next()) {
                     String fieldName = hfm.getFieldname();
+                    if (-1 != cusTreeForm.getId()) {
+                        fieldName = cusTreeForm.getId() + fieldName;
+                    }
                     String fieldLabel = SystemEnv.getHtmlLabelNames(hfm.getLable(), user.getLanguage());
                     importFields.add(HrmFormFieldPO.builder().fieldName(fieldName).labelName(fieldLabel).build());
                 }