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 7c3f651b8..bf5fd12de 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 @@ -578,6 +578,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList("1"); + 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查询数据 @@ -686,11 +688,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : dataList.get(0).entrySet()) { + if(treeList.contains(entry.getKey())){ + String value = (String) entry.getValue(); + if(StringUtils.isNotBlank(value)){ + dataList.get(0).put(entry.getKey(), Arrays.asList(value.split(","))); + }else{ + dataList.get(0).put(entry.getKey(), null); + } + } } return dataList; } @@ -1959,18 +1965,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); - //1.先判断是否订阅 -// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.in(OnlCgformSubscribe::getDocumentId, (String) map.get("id")); -// List onlCgformSubscribeList = iOnlCgformSubscribeService.list(lambdaQueryWrapper); -// List userNameList = new ArrayList<>(); -// if (onlCgformSubscribeList.size() != 0) { -// for (OnlCgformSubscribe onlCgformSubscribe : onlCgformSubscribeList) { -// userNameList.add(onlCgformSubscribe.getCreateBy()); -// } -// List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ",")); -// List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - String id = (String) map.get("id"); String title = (String) map.get("title"); String href = "