diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index f2dca122..f81547f7 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3915,6 +3915,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())) .collect(Collectors.toList()); List fieldPersonList = onlCgformFieldPersonList.stream().map(LawsTag::getDbFieldName).collect(Collectors.toList()); + // 部门选择 + List onlCgformFieldDepartList = fieldList.stream() + .filter(e -> FieldTypeEnum.GROUP_MANY.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fieldDepartList = onlCgformFieldDepartList.stream().map(LawsTag::getDbFieldName).collect(Collectors.toList()); // 标准选择 List onlCgformFieldStanList = fieldList.stream() .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())) @@ -3950,7 +3955,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl entry.getKey().equals(e.getDbFieldName()) && !FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) .collect(Collectors.toList()); // 特殊翻译 - if (entry.getKey().equals("applicable_components")){ + if (entry.getKey().equals("part_name")){ String applicableComponents = (String) entry.getValue(); List partNames = IPartNameService.queryEcho(applicableComponents); entry.setValue(partNames.stream().map(PartName::getName).collect(Collectors.joining(","))); @@ -3985,6 +3990,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysDepartList = sysDepartService.listByIds(Arrays.asList(entry.getValue().toString().split(","))); + if(CollectionUtil.isNotEmpty(sysDepartList)){ + StringBuilder stringBuilder = new StringBuilder(); + for(SysDepart sysDepart : sysDepartList){ + stringBuilder.append(sysDepart.getDepartName()).append(","); + } + String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(",")); + entry.setValue(value); + } + } } } return itemsDataForExport;