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 0fc2f46ea..c5ab2107c 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 @@ -725,17 +725,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 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 onlCgformFieldPersonList = fieldList.stream().filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + List personList = onlCgformFieldPersonList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); //多选日期 + List userNameList = new ArrayList<>(); for (Map.Entry entry : dataList.get(0).entrySet()) { String key = entry.getKey(); + if(personList.contains(key)){ + String value = (String) entry.getValue(); + userNameList.addAll(Arrays.asList(value.split(","))); + } if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){ String value = (String) entry.getValue(); entry.setValue(Arrays.asList(value.split(","))); } } + List userList = new ArrayList<>(); + if(userNameList.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysUser::getUsername,userNameList); + userList = sysUserService.list(wrapper); + } + //查询所有 List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); @@ -750,6 +764,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl personKeyList = new ArrayList<>(); for (Map.Entry entry : dataList.get(0).entrySet()) { if(treeList.contains(entry.getKey())){ String value = (String) entry.getValue(); @@ -759,6 +774,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl users = new ArrayList<>(); + if(userList.size() != 0 && StringUtils.isNotBlank(value)){ + for (String s : value.split(",")) { + List sysUserList = userList.stream().filter(e -> e.getUsername().equals(s)).collect(Collectors.toList()); + users.addAll(sysUserList); + } + if(users.size() != 0){ + List userIdList = users.stream().map(SysUser::getId).collect(Collectors.toList()); + dataList.get(0).put(personKey + "_id",StringUtils.join(userIdList,",")); + } + } + } } return dataList; }