puzhibing
2024-01-19 dc600db1211ba96302c2f75b4dd224512aad89cf
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -556,8 +556,21 @@
        if (StringUtils.isNotBlank(mgtShopPageDto.getShopTags())) {
            mgtShopPageDto.setShopTags(mgtShopPageDto.getShopTags().replace(",", "|"));
        }
        List<Long> belongUserIds = null;
        if(null != mgtShopPageDto.getDeptId()){
            if(null != mgtShopPageDto.getBelongUserId()){
                belongUserIds = new ArrayList<>();
                belongUserIds.add(mgtShopPageDto.getBelongUserId());
            }else{
                R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
                if(r.getCode() != 200){
                    throw new RuntimeException(r.getMsg());
                }
                belongUserIds = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
            }
        }
        // 分页查询商铺信息
        List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto);
        List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto, belongUserIds);
        // 如果查询结果不为空
        if (!mgtShopPageVoList.isEmpty()) {
            // 创建签约用户ID集合和所属用户ID集合