修改数据权限bug

puzhibing

2024-01-26 3d18ffe2196677fe9669f0ff2085413803d4a73c

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -4232,6 +4232,14 @@
            return totalActivityTotalVo;
        }

        //数据权限
        List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
        if(null != userIds){
            List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
            userIdList.addAll(userIds);
            mgtBasePlatformDto.setUserIdList(userIdList);
        }

        List<Long> shopIdList = remoteShopService.listShopIdByPlTotal(mgtBasePlatformDto).getData();
        if (StringUtils.isNotBlank(mgtBasePlatformDto.getShopProvinceCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopCityCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopAreaCode())) {
            if(shopIdList==null||shopIdList.isEmpty()){
@@ -4242,20 +4250,7 @@
            shopIdList = new ArrayList<>();
            shopIdList.add(mgtBasePlatformDto.getShopId());
        }
        //数据权限
        List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
        if(null != userIds){
            BoardMemberTotalDto boardMemberTotalDto = new BoardMemberTotalDto();
            boardMemberTotalDto.setUserIds(userIds);
            List<Shop> shopList = remoteShopService.getShopBySysUserIds(boardMemberTotalDto);
            List<Long> collect = shopList.stream().map(Shop::getShopId).collect(Collectors.toList());
            if(null != shopIdList){
                shopIdList.addAll(collect);
            }else{
                shopIdList = collect;
            }
            mgtBasePlatformDto.setShopIdList(shopIdList);
        }

        //获取基础统计
        MgtPlTotalActivityTotalVo mgtTotalActivityTotalVo = orderMapper.getPlTotalActivityTotal(mgtBasePlatformDto);
        totalActivityTotalVo.setOrderTotal(mgtTotalActivityTotalVo.getOrderTotal());