From 8e93568aa44326f331247511660e72fb32c1b8ae Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Thu, 10 Nov 2022 14:07:50 +0800
Subject: [PATCH] =?UTF-8?q?bug=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          | 10 +++++-----
 .../organization/service/impl/PostInfoServiceImpl.java |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
index dd90708f..388d081f 100644
--- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
@@ -163,17 +163,17 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
 
         if("joblevel".equals(importType)){
             List<FieldTransferParam> fieldDatas = new ArrayList<>();
-            fieldDatas.add(FieldTransferParam.builder().id("1").name("方案编号").build());
-            fieldDatas.add(FieldTransferParam.builder().id("2").name("方案名称").build());
-            fieldDatas.add(FieldTransferParam.builder().id("3").name("职级编号").build());
-            fieldDatas.add(FieldTransferParam.builder().id("4").name("职级名称").build());
+            fieldDatas.add(FieldTransferParam.builder().id("1").name("职级编号").build());
+            fieldDatas.add(FieldTransferParam.builder().id("2").name("职级名称").build());
+            fieldDatas.add(FieldTransferParam.builder().id("3").name("方案编号").build());
+            fieldDatas.add(FieldTransferParam.builder().id("4").name("方案名称").build());
             fieldDatas.add(FieldTransferParam.builder().id("5").name("职等编号").build());
             fieldDatas.add(FieldTransferParam.builder().id("6").name("职等名称").build());
             fieldDatas.add(FieldTransferParam.builder().id("7").name("方案说明").build());
             fieldDatas.add(FieldTransferParam.builder().id("8").name("职级说明").build());
             fieldDatas.add(FieldTransferParam.builder().id("9").name("职等说明").build());
             List<String> selectedKeys = new ArrayList<>();
-            for(int i=0;i<fieldDatas.size();i++){
+            for(int i=0;i<fieldDatas.subList(0,6).size();i++){
                 selectedKeys.add(fieldDatas.get(i).getId());
             }
             returnMaps.put("data", fieldDatas);
diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java
index e887cff8..0fd60b62 100644
--- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java
+++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java
@@ -191,13 +191,17 @@ public class PostInfoServiceImpl extends Service implements PostInfoService {
         topMenuList.add(MenuBtn.topMenu_addNew());
         // 批量删除
         topMenuList.add(MenuBtn.topMenu_batchDelete());
+        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
+
         btnDatas.put("topMenu", topMenuList);
         // 新增
         rightMenuList.add(MenuBtn.rightMenu_addNew());
+        rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("0").menuFun("import").menuIcon("icon-coms-leading-in").menuName("批量导入").type("BTN_BatchImport").build());
         // 日志
         rightMenuList.add(MenuBtn.rightMenu_btnLog());
         // 显示列定制
         rightMenuList.add(MenuBtn.rightMenu_btnColumn());
+
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }