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 infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ""); - List fieldDatas = infoPOList.stream().filter(item -> !exculdeFields.contains(item.getFieldName())).map(item -> { + List filterList = infoPOList.stream().filter(item -> !exculdeFields.contains(item.getFieldName()) && 6 != item.getControlType()).collect(Collectors.toList()); + List 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 selectedKeys = infoPOList.stream().filter(item -> (!exculdeFields.contains(item.getFieldName()) && 0 == item.getIsSystemDefault())).map(ExtendInfoPO::getId).collect(Collectors.toList()); + List selectedKeys = filterList.stream().filter(item -> (0 == item.getIsSystemDefault())).map(ExtendInfoPO::getId).collect(Collectors.toList()); returnMaps.put("data", fieldDatas); returnMaps.put("selectedKeys", selectedKeys); return returnMaps;