diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java
index 78cbd90c7..ebcabbaec 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java
@@ -37,7 +37,7 @@ public class RoleController {
     @SaAdminCheckPermission(value = "role:list", name = "角色列表")
     @GetMapping("/list")
     public CzgResult<Page<SysRole>> getList(PageDTO pageDTO, String key, String startTime, String endTime) {
-        return CzgResult.success(roleService.getList(pageDTO, key, startTime, endTime));
+        return CzgResult.success(roleService.getList(StpKit.USER.getShopId(), pageDTO, key, startTime, endTime));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java
index 1de0a8e7f..6209d38a5 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java
@@ -19,7 +19,7 @@ public interface SysRoleService extends IService<SysRole> {
 
     List<SysRole> getByUserId(Long id);
 
-    Page<SysRole> getList(PageDTO pageDTO, String key, String startTime, String endTime);
+    Page<SysRole> getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime);
 
     Boolean add(RoleAddDTO roleAddDTO);
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
index f1b4059a4..5d3b5d056 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
@@ -46,8 +46,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole>  imp
     }
 
     @Override
-    public Page<SysRole> getList(PageDTO pageDTO, String key, String startTime, String endTime) {
-        QueryWrapper queryWrapper = new QueryWrapper();
+    public Page<SysRole> getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) {
+        QueryWrapper queryWrapper = new QueryWrapper().eq(SysRole::getShopId, shopId);
         if (!StpKit.USER.isAdmin()) {
             queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong());
         }