156463

whywhyo

2023-08-13 6c0b8a28d28044372d2b90c63aef0a2fbfa6c0a3

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java

@@ -53,6 +53,9 @@
    @Resource
    ZAuthorityService zAuthorityService;

    @Resource
    ZfCollectionMapper zfCollectionMapper;

    private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfCollection::getCreateTime);
@@ -354,7 +357,7 @@
        }

        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
        List<Long> familyIdList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(COLLECTION_LIST_ADD)).map(ZAuthority::getFid).collect(Collectors.toList());
        familyIdList.add(familyId);

        if (zfCollection.getFamilyId()!=null && !familyIdList.contains(zfCollection.getFamilyId())) {
@@ -430,6 +433,12 @@
        }
    }

    @Override
    public AjaxResult listType() {
        List<String> result = zfCollectionMapper.listType();
        return AjaxResult.success(result);
    }


    @Override
    @Transactional