From cdd2e6384ef7c1a0e5c1144aa3ebb5281c2b72ba Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Thu, 8 Jun 2023 15:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=20BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ImportCommonServiceImpl.java | 60 ++++++++++---------
 .../util/saveimport/ResourceImport.java       |  3 +
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
index 4d054d55..8390babb 100644
--- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
@@ -796,35 +796,37 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
                 departmentColumn = column;
                 iterator.remove();
             }
-            if ("方案编号".equals(column)) {
-                schemeList.add(column);
-                levelList.add(column);
-                gradeList.add(column);
-            }
-            if ("方案名称".equals(column)) {
-                schemeList.add(column);
-            }
-            if ("方案说明".equals(column)) {
-                schemeList.add(column);
-            }
-            if ("职等编号".equals(column)) {
-                levelList.add(0, column);
-                gradeList.add(column);
-            }
-            if ("职等名称".equals(column)) {
-                levelList.add(1, column);
-            }
-            if ("职等说明".equals(column)) {
-                levelList.add(column);
-            }
-            if ("职级编号".equals(column)) {
-                gradeList.add(0, column);
-            }
-            if ("职级名称".equals(column)) {
-                gradeList.add(1, column);
-            }
-            if ("职级说明".equals(column)) {
-                gradeList.add(column);
+            if ("joblevel".equals(importType)) {
+                if ("方案编号".equals(column)) {
+                    schemeList.add(column);
+                    levelList.add(column);
+                    gradeList.add(column);
+                }
+                if ("方案名称".equals(column)) {
+                    schemeList.add(column);
+                }
+                if ("方案说明".equals(column)) {
+                    schemeList.add(column);
+                }
+                if ("职等编号".equals(column)) {
+                    levelList.add(0, column);
+                    gradeList.add(column);
+                }
+                if ("职等名称".equals(column)) {
+                    levelList.add(1, column);
+                }
+                if ("职等说明".equals(column)) {
+                    levelList.add(column);
+                }
+                if ("职级编号".equals(column)) {
+                    gradeList.add(0, column);
+                }
+                if ("职级名称".equals(column)) {
+                    gradeList.add(1, column);
+                }
+                if ("职级说明".equals(column)) {
+                    gradeList.add(column);
+                }
             }
         }
         if (StringUtils.isNotBlank(departmentColumn.toString())) {
diff --git a/src/com/engine/organization/util/saveimport/ResourceImport.java b/src/com/engine/organization/util/saveimport/ResourceImport.java
index be8adda4..cf61ed38 100644
--- a/src/com/engine/organization/util/saveimport/ResourceImport.java
+++ b/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());
                 }