diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 1d5ebc472..d7c18dc4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -591,14 +591,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getDocumentInfoById(String id, String cut) { //字段属性 - List fieldList = onlCgformFieldService.getFieldList("1"); + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); List treeOnlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List treeList = treeOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List onlCgformFieldDateMoreList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); - //处理多选日期 + //多选日期 for (Map.Entry entry : dataList.get(0).entrySet()) { String key = entry.getKey(); if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){ @@ -1123,7 +1123,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())) .collect(Collectors.toList()); List fileList = onlCgformFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); - //过滤出人员选择字段 - List personnelPnlCgformFieldFileList = fieldList.stream() - .filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())) - .collect(Collectors.toList()); - List personnelList = personnelPnlCgformFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); - List personnelValue = new ArrayList<>(); List records = infoPage.getRecords(); - for (Map record : records) { - Map record1 = (Map) record; - for (Map.Entry entry : record1.entrySet()) { - //过滤出人员选择的数据 - if(personnelList.size() != 0 && personnelList.contains(entry.getKey())){ - String value = (String) entry.getValue(); - if(ObjectUtils.isNotEmpty(value)){ - personnelValue.addAll(Arrays.asList(value.split(","))); - } - } - } - } - List userList = new ArrayList<>(); - if(personnelValue.size() != 0){ - //查询用户信息(根据用户名) - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(SysUser::getId,personnelValue); - userList = sysUserService.list(wrapper); - } //数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); //下拉选处理数据字典 List idList = new ArrayList<>(); List fileIdLidt = new ArrayList<>(); - for (Map record : records) { Map record1 = (Map) record; idList.add((String) record1.get("id")); for (Map.Entry entry : record1.entrySet()) { - String key = entry.getKey(); - String value = (String) entry.getValue(); - //处理人员选择 - if(personnelList.contains(key) && StringUtils.isNotBlank(value)){ - StringBuilder sb = new StringBuilder(); - for (String userId : value.split(",")) { - List sysUserList = userList.stream().filter(e -> userId.equals(e.getId())).collect(Collectors.toList()); - if(sysUserList.size() != 0){ - sb.append(sysUserList.get(0).getUsername()+","); - } - } - if(StringUtils.isNotBlank(sb)){ - String substring = sb.substring(0, sb.length() - 1); - entry.setValue(substring); - } - } - //下拉选处理数据字典 dictItem(sysDictItems, entry, cut, fieldList,null); treeDictItem(categoryList, entry, treeFieldList, cut,null);