Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

昨天 2cf783a1480050c0f13907c5fde625edee8fce62

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

@@ -74,7 +74,8 @@
    @ApiOperation(value = "获取简易商户列表")
    public R<List<MgtShopListSimpleVo>> listMgtShopSimpleVo(@RequestBody MgtShopListDto mgtShopListDto) {
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -125,7 +126,8 @@
    @ApiOperation(value = "分页获取商户列表")
    public R<Page<MgtShopPageVo>> pageMgtShop(@RequestBody MgtShopPageDto mgtShopPageDto) {
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -194,7 +196,8 @@
            page.setCurrent(mgtShopPageDto.getPageNum());
        }
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -424,7 +427,8 @@
        page.setSize(mgtShopAuthPageDto.getPageSize());
        page.setCurrent(mgtShopAuthPageDto.getPageNum());
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){
@@ -511,7 +515,8 @@
    @ApiOperation(value = "分页获取商户进件列表（汇付天下）")
    public R<Page<MgtShopHFTXAuthPageVo>> pageMgtShopHFTXAuth(@RequestBody MgtShopHFTXAuthPageDto mgtShopAuthPageDto) {
        // 获取当前登陆人的可视权限
        SysUser sysUser = SecurityUtils.getSysUser();
        SysUser sysUserId = SecurityUtils.getSysUser();
        SysUser sysUser = sysUserService.getSysUser(sysUserId.getUserId()).getData();
        // 店铺ids
        List<Long> scope = new ArrayList<>();
        if (sysUser!=null){