!166 分部导入

Merge pull request !166 from dxfeng/feature/dxf

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;