修改数据权限bug

puzhibing

2024-01-26 4924df4e316fa1acf75bcf7240227deac767c357

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java

@@ -31,6 +31,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.rmi.server.ServerCloneException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -170,6 +171,13 @@
                }
            }
        }
        if(null != mgtShopPageDto.getDeptId()){
            R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
            List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
            List<Shop> shops = shopService.getShopBySysUserIds(collect);
            scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
        }

        Page<MgtShopPageVo> page = new Page<>();
        page.setSize(mgtShopPageDto.getPageSize());
        page.setCurrent(mgtShopPageDto.getPageNum());
@@ -223,6 +231,12 @@
                }
            }
        }
        if(null != mgtShopPageDto.getDeptId()){
            R<List<SysUser>> r = sysUserService.getUsersByDeptId(mgtShopPageDto.getDeptId());
            List<Long> collect = r.getData().stream().map(SysUser::getUserId).collect(Collectors.toList());
            List<Shop> shops = shopService.getShopBySysUserIds(collect);
            scope.addAll(shops.stream().map(Shop::getShopId).collect(Collectors.toList()));
        }
        List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto,scope);
        ExcelUtil<MgtShopPageVo> util = new ExcelUtil<MgtShopPageVo>(MgtShopPageVo.class);
        util.exportExcel(response, mgtShopPageVoList, "商户列表");