diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java
index 6dab3a3..7905170 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java
@@ -4,6 +4,7 @@ import com.atguigu.spzx.manger.service.SysRoleService;
 import com.atguigu.spzx.model.dto.system.SysRoleDto;
 import com.atguigu.spzx.model.entity.system.SysRole;
 import com.atguigu.spzx.model.vo.result.Result;
+import com.atguigu.spzx.model.vo.system.AllRolesVo;
 import com.github.pagehelper.PageInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,4 +46,14 @@ public class SysRoleController {
         sysRoleService.deleteById(roleId);
         return Result.success();
     }
+
+    @Operation(summary = "查询所有角色", description = "查询所有角色信息")
+    @GetMapping(value = "findAllRoles")
+    public Result<AllRolesVo> findAllRoles() {
+        AllRolesVo allRolesList = sysRoleService.findAllRoles();
+        return Result.success(allRolesList);
+    }
+
+    @Operation(summary = "保存角色数据",description = "保存角色数据信息")
+
 }
\ No newline at end of file
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleMapper.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleMapper.java
index b28df33..5128095 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleMapper.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleMapper.java
@@ -36,4 +36,11 @@ public interface SysRoleMapper {
      * @param roleId 角色id
      */
     void deleteById(Long roleId);
+
+    /**
+     * 查询所有角色
+     *
+     * @return 所有角色
+     */
+    List<SysRole> findAllRoles();
 }
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java
index 6a41fb7..7bb892d 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java
@@ -2,6 +2,7 @@ package com.atguigu.spzx.manger.service;
 
 import com.atguigu.spzx.model.dto.system.SysRoleDto;
 import com.atguigu.spzx.model.entity.system.SysRole;
+import com.atguigu.spzx.model.vo.system.AllRolesVo;
 import com.github.pagehelper.PageInfo;
 
 public interface SysRoleService {
@@ -35,4 +36,11 @@ public interface SysRoleService {
      * @param roleId 角色id
      */
     void deleteById(Long roleId);
+
+    /**
+     * 查询所有角色
+     *
+     * @return 所有角色信息
+     */
+    AllRolesVo findAllRoles();
 }
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java
index dd9bed4..0e96a59 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java
@@ -5,6 +5,7 @@ import com.atguigu.spzx.manger.mapper.SysRoleMapper;
 import com.atguigu.spzx.manger.service.SysRoleService;
 import com.atguigu.spzx.model.dto.system.SysRoleDto;
 import com.atguigu.spzx.model.entity.system.SysRole;
+import com.atguigu.spzx.model.vo.system.AllRolesVo;
 import com.atguigu.utils.StringEmptyUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -72,4 +73,15 @@ public class SysRoleServiceImpl implements SysRoleService {
         // 删除内容
         sysRoleMapper.deleteById(roleId);
     }
+
+    /**
+     * 查询所有角色
+     *
+     * @return 所有角色信息
+     */
+    @Override
+    public AllRolesVo findAllRoles() {
+        List<SysRole> sysRoleList = sysRoleMapper.findAllRoles();
+        return AllRolesVo.builder().allRolesList(sysRoleList).build();
+    }
 }
diff --git a/spzx-manager/src/main/resources/mapper/SysRoleMapper.xml b/spzx-manager/src/main/resources/mapper/SysRoleMapper.xml
index 60c1613..06d7322 100644
--- a/spzx-manager/src/main/resources/mapper/SysRoleMapper.xml
+++ b/spzx-manager/src/main/resources/mapper/SysRoleMapper.xml
@@ -51,4 +51,11 @@
         </where>
         order by id desc
     </select>
+
+    <!-- 查询所有角色 -->
+    <select id="findAllRoles" resultType="com.atguigu.spzx.model.entity.system.SysRole">
+        select
+        <include refid="columns"/>
+        from sys_role where is_deleted = 0
+    </select>
 </mapper>
diff --git a/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/AllRolesVo.java b/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/AllRolesVo.java
new file mode 100644
index 0000000..80caeae
--- /dev/null
+++ b/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/AllRolesVo.java
@@ -0,0 +1,20 @@
+package com.atguigu.spzx.model.vo.system;
+
+import com.atguigu.spzx.model.entity.system.SysRole;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "所有角色响应结果实体类")
+public class AllRolesVo {
+    @Schema(description = "所有角色")
+    private List<SysRole> allRolesList;
+}