From 79d79575da0b24557893c5c8b1b2c86fe49ece93 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Tue, 26 Jul 2022 10:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=83=A8=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/service/impl/ImportCommonServiceImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
index 73a62e60..2bd57771 100644
--- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
@@ -177,13 +177,14 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
             return returnMaps;
         }
         List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, "");
-        List<JSONObject> fieldDatas = infoPOList.stream().filter(item -> !exculdeFields.contains(item.getFieldName())).map(item -> {
+        List<ExtendInfoPO> filterList = infoPOList.stream().filter(item -> !exculdeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList());
+        List<JSONObject> fieldDatas = filterList.stream().map(item -> {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id", item.getId());
             jsonObject.put("name", item.getFieldNameDesc());
             return jsonObject;
         }).collect(Collectors.toList());
-        List<Long> selectedKeys = infoPOList.stream().filter(item -> (!exculdeFields.contains(item.getFieldName()) && 0 == item.getIsSystemDefault())).map(ExtendInfoPO::getId).collect(Collectors.toList());
+        List<Long> selectedKeys = filterList.stream().filter(item -> (0 == item.getIsSystemDefault())).map(ExtendInfoPO::getId).collect(Collectors.toList());
         returnMaps.put("data", fieldDatas);
         returnMaps.put("selectedKeys", selectedKeys);
         return returnMaps;