diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java index 444744b46..c5d144f66 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/service/impl/OcrRecordEOServiceImpl.java @@ -210,7 +210,7 @@ public class OcrRecordEOServiceImpl extends ServiceImpl documentLibraryFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); - documentLibraryFieldList = fieldList.stream() + documentLibraryFieldList = documentLibraryFieldList.stream() .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List fieldFileList = documentLibraryFieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList()); map.put("value_list",fieldFileList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index a8506783c..c1dcf0a03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -749,8 +749,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) - && FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))) .collect(Collectors.toList()); } for (OnlCgformField onlCgformField : formFieldList){ @@ -762,6 +761,34 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysUserList = sysUserService.listByIds(Arrays.asList(itemsMap.get(dbFieldName).toString().split(","))); + if(CollectionUtil.isNotEmpty(sysUserList)){ + List realNames = sysUserList.stream().map(SysUser :: getRealname).collect(Collectors.toList()); + List userNames = sysUserList.stream().map(SysUser :: getUsername).collect(Collectors.toList()); + List names = new ArrayList<>(); + for(int i=0; i> documentLibraryEOList = documentLibraryEOService.queryListByIds(itemsMap.get(dbFieldName).toString()); + if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ + String names = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); + itemsMap.put(dbFieldName+"_id", itemsMap.get(dbFieldName).toString()); + itemsMap.put(dbFieldName, names); + + } + } + } } return itemsMap; } @@ -1953,6 +1980,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl