菜单绑定

schoolNewsServ/api/api-system/src/main/java/org/xyzh/api/system/menu/MenuService.java

@@ -1,10 +1,8 @@
 package org.xyzh.api.system.menu;
 
-import java.util.List;
-
 import org.xyzh.common.core.domain.ResultDomain;
-import org.xyzh.common.core.page.PageParam;
 import org.xyzh.common.dto.menu.TbSysMenu;
+import org.xyzh.common.dto.menu.TbSysMenuPermission;
 
 /**
  * @description    MenuRemoteService.java文件描述 菜单远程服务接口
@@ -23,6 +21,15 @@ public interface MenuService {
      */
     ResultDomain<TbSysMenu> getAllMenus();
 
+    /**
+     * @description    查询菜单列表
+     * @param    filter 过滤条件
+     * @return    ResultDomain<TbSysMenu> 菜单列表
+     * @author    yslg
+     * @since 2025-09-28
+     */
+    ResultDomain<TbSysMenu> getMenuList(TbSysMenu filter);
+
     /**
      * @description    根据菜单ID查询菜单
      * @param    menuId 菜单ID
@@ -124,5 +131,12 @@ public interface MenuService {
      */
     ResultDomain<TbSysMenu> changeMenuVisibility(String menuId, Boolean visible);
 
-
+    /**
+     * @description    查询菜单权限
+     * @param    menuId 菜单ID
+     * @return    ResultDomain<TbSysMenuPermission> 菜单权限信息
+     * @author    yslg
+     * @since 2025-09-28
+     */
+    ResultDomain<TbSysMenuPermission> getMenuPermission(String menuId);
 }

schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/PermissionVO.java

@@ -7,6 +7,7 @@ import java.util.List;
 
 import org.xyzh.common.dto.BaseDTO;
 import org.xyzh.common.dto.menu.TbSysMenu;
+import org.xyzh.common.dto.permission.TbSysPermission;
 
 
 public class PermissionVO extends BaseDTO{
@@ -82,6 +83,13 @@ public class PermissionVO extends BaseDTO{
      */
     private List<TbSysRole> roles;
 
+    /**
+     * @description    绑定权限
+     * @author    yslg
+     * @since 2024-06
+     */
+    private List<TbSysPermission> permissions;
+
     /**
      * @description    更新人名称
      * @author    yslg
@@ -177,6 +185,12 @@ public class PermissionVO extends BaseDTO{
         this.roles = roles;
     }
 
+    public List<TbSysPermission> getPermissions() {
+        return permissions;
+    }
     
+    public void setPermissions(List<TbSysPermission> permissions) {
+        this.permissions = permissions;
+    }
 
 }

schoolNewsServ/system/src/main/java/org/xyzh/system/controller/MenuController.java

@@ -0,0 +1,111 @@
+package org.xyzh.system.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.xyzh.api.system.menu.MenuService;
+import org.xyzh.common.core.domain.ResultDomain;
+import org.xyzh.common.dto.menu.TbSysMenu;
+import org.xyzh.common.dto.menu.TbSysMenuPermission;
+
+@RestController
+@RequestMapping("/menus")
+public class MenuController {
+    private static final Logger logger = LoggerFactory.getLogger(MenuController.class);
+
+
+    @Autowired
+    private MenuService menuService;
+
+    /**
+     * @description    查询所有菜单
+     * @return    ResultDomain<TbSysMenu> 菜单列表
+     * @author    yslg
+     * @since 2025-10-06
+     */
+    @PostMapping("/all")
+    public ResultDomain<TbSysMenu> getAllMenus() {
+        return menuService.getAllMenus();
+    }
+
+    /**
+     * @description    查询菜单
+     * @param    filter 过滤条件
+     * @return    ResultDomain<TbSysMenu> 菜单列表
+     * @author    yslg
+     * @since 2025-10-06
+     */
+    @PostMapping("/list")
+    public ResultDomain<TbSysMenu> getMenuList(@RequestBody TbSysMenu filter) {
+        return menuService.getMenuList(filter);
+    }
+
+    /**
+     * @description    查询菜单
+     * @param    menuId 菜单ID
+     * @return    ResultDomain<TbSysMenu> 菜单信息
+     * @author    yslg
+     * @since 2025-10-06
+     */
+    @PostMapping("/id")
+    public ResultDomain<TbSysMenu> getMenuById(@RequestBody String menuId) {
+        return menuService.getMenuById(menuId);
+    }
+
+    /**
+     * @description    创建菜单
+     * @param    menu 菜单信息
+     * @return    ResultDomain<TbSysMenu> 菜单信息
+     * @author    yslg
+     * @since 2025-10-06
+     */
+    @PostMapping("/menu")
+    public ResultDomain<TbSysMenu> createMenu(@RequestBody TbSysMenu menu) {
+        return menuService.createMenu(menu);
+    }
+
+    /**
+     * @description    删除菜单
+     * @param    menuId 菜单ID
+     * @return    ResultDomain<TbSysMenu> 菜单信息
+     * @author    yslg
+     * @since 2025-10-06
+     */
+    @DeleteMapping("/menu")
+    public ResultDomain<TbSysMenu> deleteMenu(@RequestBody String menuId) {
+        return menuService.deleteMenu(menuId);
+    }
+
+    /**
+     * @description    更新菜单
+     * @param    menu 菜单信息
+     * @return    ResultDomain<TbSysMenu> 菜单信息
+     * @author    yslg
+     * @since 2025-10-06
+     */
+    @PutMapping("/menu")
+    public ResultDomain<TbSysMenu> updateMenu(@RequestBody TbSysMenu menu) {
+        return menuService.updateMenu(menu);
+    }
+    
+
+    /**
+     * @description    查询菜单权限
+     * @param    menuId 菜单ID
+     * @return    ResultDomain<TbSysMenuPermission> 菜单权限信息
+     * @author    yslg
+     * @since 2025-10-06
+     */
+    @PostMapping("/permission")
+    public ResultDomain<TbSysMenuPermission> getMenuPermission(@RequestBody TbSysMenu menu) {
+        return menuService.getMenuPermission(menu.getMenuID());
+    }
+    
+}

schoolNewsServ/system/src/main/java/org/xyzh/system/controller/PermissionController.java

@@ -1,5 +1,9 @@
 package org.xyzh.system.controller;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +17,11 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.xyzh.api.system.permission.PermissionService;
 import org.xyzh.common.core.domain.ResultDomain;
+import org.xyzh.common.dto.menu.TbSysMenu;
+import org.xyzh.common.dto.menu.TbSysMenuPermission;
 import org.xyzh.common.dto.permission.TbSysPermission;
+import org.xyzh.common.dto.role.TbSysRole;
+import org.xyzh.common.dto.role.TbSysRolePermission;
 import org.xyzh.common.vo.PermissionVO;
 
 @RestController
@@ -89,4 +97,57 @@ public class PermissionController {
     public ResultDomain<PermissionVO> listPermissionBinding(@RequestBody PermissionVO permission) {
         return permissionService.listPermissionBinding(permission);
     }
+
+    /**
+     * @description    绑定菜单
+     * @param permission
+     * @author    yslg
+     * @ since 2025-10-06
+     */
+    @PostMapping("/bind/menu")
+    public ResultDomain<TbSysMenuPermission> bindMenu(@RequestBody PermissionVO permission) {
+        List<String> menuIds = permission.getMenus().stream().map(TbSysMenu::getMenuID).collect(Collectors.toList());
+        List<String> permissionIds = permission.getPermissions().stream().map(TbSysPermission::getPermissionID).collect(Collectors.toList());
+        return permissionService.batchBindMenuPermission(menuIds, permissionIds);
+    }
+
+    /**
+     * @description    解绑菜单
+     * @param permission
+     * @author    yslg
+     * @ since 2025-10-06
+     */
+    @PostMapping("/unbind/menu")
+    public ResultDomain<TbSysMenuPermission> unbindMenu(@RequestBody PermissionVO permission) {
+        List<String> menuIds = permission.getMenus().stream().map(TbSysMenu::getMenuID).collect(Collectors.toList());
+        List<String> permissionIds = permission.getPermissions().stream().map(TbSysPermission::getPermissionID).collect(Collectors.toList());
+        return permissionService.batchUnbindMenuPermission(menuIds, permissionIds);
+    }
+
+    /**
+     * @description    绑定角色
+     * @param permission
+     * @author    yslg
+     * @ since 2025-10-06
+     */
+    @PostMapping("/bind/role")
+    public ResultDomain<TbSysRolePermission> bindRole(@RequestBody PermissionVO permission) {
+        List<String> roleIds = permission.getRoles().stream().map(TbSysRole::getRoleID).collect(Collectors.toList());
+        List<String> permissionIds = permission.getPermissions().stream().map(TbSysPermission::getPermissionID).collect(Collectors.toList());
+        return permissionService.batchBindRolePermission(roleIds, permissionIds);
+    }
+
+    /**
+     * @description    解绑角色
+     * @param permission
+     * @author    yslg
+     * @ since 2025-10-06
+     */
+    @PostMapping("/unbind/role")
+    public ResultDomain<TbSysRolePermission> unbindRole(@RequestBody PermissionVO permission) {
+        List<String> roleIds = permission.getRoles().stream().map(TbSysRole::getRoleID).collect(Collectors.toList());
+        List<String> permissionIds = permission.getPermissions().stream().map(TbSysPermission::getPermissionID).collect(Collectors.toList());
+        return permissionService.batchUnbindRolePermission(roleIds, permissionIds);
+    }
+    
 }

schoolNewsServ/system/src/main/java/org/xyzh/system/controller/RoleController.java

@@ -0,0 +1,38 @@
+package org.xyzh.system.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.xyzh.api.system.role.RoleService;
+import org.xyzh.common.core.domain.ResultDomain;
+import org.xyzh.common.dto.role.TbSysRole;
+
+/**
+ * @description    RoleController.java文件描述 角色控制器
+ * @filename    RoleController.java
+ * @author    yslg
+ * @copyright xyzh
+ * @ since 2025-10-09
+ */
+@RestController
+@RequestMapping("/roles")
+public class RoleController {
+    private static final Logger logger = LoggerFactory.getLogger(RoleController.class);
+
+    @Autowired
+    private RoleService roleService;
+
+    /**
+     * @description    获取所有角色
+     * @return  角色列表
+     * @author    yslg
+     * @ since 2025-10-09
+     */
+    @PostMapping("/all")
+    public ResultDomain<TbSysRole> all() {
+        return roleService.getAllRoles();
+    }
+}

schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/MenuMapper.java

@@ -17,6 +17,32 @@ import java.util.List;
 @Mapper
 public interface MenuMapper extends BaseMapper<TbSysMenu> {
 
+    /**
+     * @description 查询所有菜单
+     * @return List<TbSysMenu> 菜单列表
+     * @author yslg
+     * @since 2025-09-28
+     */
+    List<TbSysMenu> selectAllMenus();
+
+    /**
+     * @description 查询菜单列表
+     * @param filter 过滤条件
+     * @return List<TbSysMenu> 菜单列表
+     * @author yslg
+     * @since 2025-09-28
+     */
+    List<TbSysMenu> selectMenuList(TbSysMenu filter);
+
+    /**
+     * @description 查询菜单
+     * @param menuId 菜单ID
+     * @return TbSysMenu 菜单
+     * @author yslg
+     * @since 2025-09-28
+     */
+    TbSysMenu selectMenuById(String menuId);
+
     /**
      * @description 根据用户ID查询菜单列表
      * @param userId 用户ID

schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/PermissionMapper.java

@@ -147,7 +147,7 @@ public interface PermissionMapper extends BaseMapper<TbSysPermission> {
      * @author yslg
      * @since 2025-10-08
      */
-    List<TbSysMenu> selectPermissionBindMenu(PermissionVO permission);
+    List<TbSysMenu> selectPermissionBindMenu(@Param("permission") PermissionVO permission);
 
     /**
      * @description 查询权限绑定角色
@@ -156,5 +156,5 @@ public interface PermissionMapper extends BaseMapper<TbSysPermission> {
      * @author yslg
      * @since 2025-10-08
      */
-    List<TbSysRole> selectPermissionBindRole(PermissionVO permission);
+    List<TbSysRole> selectPermissionBindRole(@Param("permission") PermissionVO permission);
 }

schoolNewsServ/system/src/main/java/org/xyzh/system/mapper/RoleMapper.java

@@ -18,6 +18,14 @@ import java.util.List;
 @Mapper
 public interface RoleMapper extends BaseMapper<TbSysRole> {
 
+    /**
+     * @description 查询所有角色
+     * @return List<TbSysRole> 角色列表
+     * @author yslg
+     * @since 2025-10-09
+     */
+    List<TbSysRole> selectAllRoles();
+
     /**
      * @description 根据用户ID查询角色列表
      * @param userId 用户ID

schoolNewsServ/system/src/main/java/org/xyzh/system/menu/service/impl/SysMenuServiceImpl.java

@@ -1,6 +1,5 @@
 package org.xyzh.system.menu.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,8 +7,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.xyzh.common.core.domain.ResultDomain;
 import org.xyzh.common.dto.menu.TbSysMenu;
+import org.xyzh.common.dto.menu.TbSysMenuPermission;
 import org.xyzh.common.utils.IDUtils;
 import org.xyzh.system.mapper.MenuMapper;
+import org.xyzh.system.mapper.MenuPermissionMapper;
 import org.xyzh.system.menu.service.SysMenuService;
 
 import java.util.Date;
@@ -30,6 +31,9 @@ public class SysMenuServiceImpl implements SysMenuService {
     @Autowired
     private MenuMapper menuMapper;
 
+    @Autowired
+    private MenuPermissionMapper menuPermissionMapper;
+
     @Override
     public ResultDomain<TbSysMenu> getAllMenus() {
         ResultDomain<TbSysMenu> resultDomain = new ResultDomain<>();
@@ -37,11 +41,7 @@ public class SysMenuServiceImpl implements SysMenuService {
         try {
             logger.info("开始查询所有菜单");
             
-            LambdaQueryWrapper<TbSysMenu> queryWrapper = new LambdaQueryWrapper<>();
+            List<TbSysMenu> menus = menuMapper.selectAllMenus();
-            queryWrapper.eq(TbSysMenu::getDeleted, false)
-                       .orderByAsc(TbSysMenu::getCreateTime);
-
-            List<TbSysMenu> menus = menuMapper.selectList(queryWrapper);
             
             logger.info("查询所有菜单完成，共找到{}个菜单", menus.size());
             resultDomain.success("查询成功", menus);
@@ -54,6 +54,26 @@ public class SysMenuServiceImpl implements SysMenuService {
         }
     }
 
+    @Override
+    public ResultDomain<TbSysMenu> getMenuList(TbSysMenu filter) {
+        ResultDomain<TbSysMenu> resultDomain = new ResultDomain<>();
+        try {
+            logger.info("开始查询菜单列表：{}", filter);
+            
+            List<TbSysMenu> menus = menuMapper.selectMenuList(filter);
+            
+            logger.info("查询菜单列表完成，共找到{}个菜单", menus.size());
+            resultDomain.success("查询成功", menus);
+            return resultDomain;
+            
+        } catch (Exception e) {
+            logger.error("查询菜单列表失败：{}", filter, e);
+            resultDomain.fail("查询菜单失败：" + e.getMessage());
+            return resultDomain;
+        }
+        
+    }
+
     @Override
     public ResultDomain<TbSysMenu> getMenuById(String menuId) {
         ResultDomain<TbSysMenu> resultDomain = new ResultDomain<>();
@@ -65,11 +85,7 @@ public class SysMenuServiceImpl implements SysMenuService {
                 return resultDomain;
             }
             
-            LambdaQueryWrapper<TbSysMenu> queryWrapper = new LambdaQueryWrapper<>();
+            TbSysMenu menu = menuMapper.selectMenuById(menuId);
-            queryWrapper.eq(TbSysMenu::getMenuID, menuId)
-                       .eq(TbSysMenu::getDeleted, false);
-            
-            TbSysMenu menu = menuMapper.selectOne(queryWrapper);
             
             if (menu == null) {
                 logger.warn("未找到菜单：{}", menuId);
@@ -445,4 +461,23 @@ public class SysMenuServiceImpl implements SysMenuService {
             return resultDomain;
         }
     }
+    
+    @Override
+    public ResultDomain<TbSysMenuPermission> getMenuPermission(String menuId) {
+        ResultDomain<TbSysMenuPermission> resultDomain = new ResultDomain<>();
+        try {
+            logger.info("开始查询菜单权限：{}", menuId);
+            List<TbSysMenuPermission> menuPermissions = menuPermissionMapper.selectByMenuId(menuId);
+            if (menuPermissions.isEmpty()) {
+                resultDomain.fail("未找到菜单权限");
+                return resultDomain;
+            }
+            resultDomain.success("查询菜单权限成功", menuPermissions);
+            return resultDomain;
+        } catch (Exception e) {
+            logger.error("查询菜单权限异常：{}", menuId, e);
+            resultDomain.fail("查询菜单权限失败：" + e.getMessage());
+            return resultDomain;
+        }
+    }
 }

schoolNewsServ/system/src/main/java/org/xyzh/system/role/service/impl/SysRoleServiceImpl.java

@@ -39,11 +39,7 @@ public class SysRoleServiceImpl implements SysRoleService {
         try {
             logger.info("开始查询所有角色");
             
-            LambdaQueryWrapper<TbSysRole> queryWrapper = new LambdaQueryWrapper<>();
+            List<TbSysRole> roles = roleMapper.selectAllRoles();
-            queryWrapper.eq(TbSysRole::getDeleted, false)
-                       .orderByAsc(TbSysRole::getCreateTime);
-            
-            List<TbSysRole> roles = roleMapper.selectList(queryWrapper);
             
             logger.info("查询所有角色完成，共找到{}个角色", roles.size());
             resultDomain.success("查询成功", roles);

schoolNewsServ/system/src/main/resources/mapper/MenuMapper.xml

@@ -39,6 +39,47 @@
             </if>
         </where>
     </sql>
+    <sql id="Where_Clause_List">
+        <where>
+            m.deleted = 0
+            <if test="menuID != null and menuID != ''">
+                AND m.menu_id = #{menuID}
+            </if>
+            <if test="name != null and name != ''">
+                AND m.name LIKE CONCAT('%', #{name}, '%')
+            </if>
+            <if test="type != null">
+                AND m.type = #{type}
+            </if>
+        </where>
+    </sql>
+
+    <!-- selectAllMenus --> 
+
+    <select id="selectAllMenus" resultMap="BaseResultMap">
+        SELECT 
+        <include refid="Base_Column_List"/>
+        FROM tb_sys_menu m
+        WHERE m.deleted = 0
+        ORDER BY m.menu_id, m.create_time ASC
+    </select>
+
+    <!-- selectMenuList --> 
+    <select id="selectMenuList" resultMap="BaseResultMap">
+        SELECT 
+        <include refid="Base_Column_List"/>
+        FROM tb_sys_menu m
+        <include refid="Where_Clause_List"/>
+        ORDER BY m.menu_id, m.create_time ASC
+    </select>
+
+    <!-- selectMenuById --> 
+    <select id="selectMenuById" resultMap="BaseResultMap">
+        SELECT 
+        <include refid="Base_Column_List"/>
+        FROM tb_sys_menu m
+        WHERE m.deleted = 0 AND m.menu_id = #{menuId}
+    </select>
 
     <!-- 根据用户ID查询菜单列表 -->
     <select id="selectMenusByUserId" resultMap="BaseResultMap">
@@ -161,7 +202,7 @@
             <if test="updater != null">updater = #{updater},</if>
             update_time = NOW()
         </set>
-        WHERE id = #{id} AND deleted = 0
+        WHERE menu_id = #{menuId} AND deleted = 0
     </update>
 
     <!-- 根据ID删除（逻辑删除） -->
@@ -169,12 +210,12 @@
         UPDATE tb_sys_menu 
         SET deleted = 1,
             delete_time = NOW()
-        WHERE id = #{id} AND deleted = 0
+        WHERE menu_id = #{menuId} AND deleted = 0
     </update>
 
     <!-- 检查菜单是否存在 -->
     <select id="checkMenuExists">
-        SELECT * FROM tb_sys_menu WHERE id IN
+        SELECT * FROM tb_sys_menu WHERE menu_id IN
         <foreach collection="menuIds" item="menuId" open="(" separator="," close=")">
             #{menuId}
         </foreach>

schoolNewsServ/system/src/main/resources/mapper/PermissionMapper.xml

@@ -37,7 +37,6 @@
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="menu_id" property="menuID" jdbcType="VARCHAR"/>
         <result column="name" property="name" jdbcType="VARCHAR"/>
-        <result column="description" property="description" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="PermissionBindRole" type="org.xyzh.common.dto.role.TbSysRole">
@@ -268,12 +267,12 @@
 
     <select id="selectPermissionBindMenu" resultMap="PermissionBindMenu">
         SELECT 
-            tsm.id, tsm.menu_id, tsm.name, tsm.description
+            tsm.id, tsm.menu_id, tsm.name
         FROM tb_sys_menu tsm
-        INNER JOIN tb_sys_menu_permission tsmp ON tsmp.menu_id = tsm.id
+        INNER JOIN tb_sys_menu_permission tsmp ON tsmp.menu_id = tsm.menu_id
         WHERE tsm.deleted = 0 
         AND tsmp.deleted = 0
-        AND tsmp.permission_id = #{permission.id}
+        AND tsmp.permission_id = #{permission.permissionID}
         ORDER BY tsm.menu_id, tsm.create_time ASC
     </select>
 
@@ -282,10 +281,10 @@
         SELECT 
             tsr.id, tsr.role_id, tsr.name, tsr.description
         FROM tb_sys_role tsr
-        INNER JOIN tb_sys_role_permission tsrp ON tsrp.role_id = tsr.id
+        INNER JOIN tb_sys_role_permission tsrp ON tsrp.role_id = tsr.role_id
         WHERE tsr.deleted = 0 
         AND tsrp.deleted = 0
-        AND tsrp.permission_id = #{permission.id}
+        AND tsrp.permission_id = #{permission.permissionID}
         ORDER BY tsr.role_id, tsr.create_time ASC
     </select>
 </mapper>

schoolNewsServ/system/src/main/resources/mapper/RoleMapper.xml

@@ -39,7 +39,7 @@
     </resultMap>
     <!-- 基础字段 -->
     <sql id="TbSysRole_Column_List">
-        id, dept_id, role_id, name, description, creator, updater, 
+        id, role_id, name, description, creator, updater, 
         create_time, update_time, delete_time, deleted
     </sql>
     <sql id="TbSysDeptRole_Column_List">
@@ -70,6 +70,16 @@
         </where>
     </sql>
 
+        <!-- selectAllRoles --> 
+
+    <select id="selectAllRoles" resultMap="tbSysRoleResultMap">
+        SELECT 
+        <include refid="TbSysRole_Column_List"/>
+        FROM tb_sys_role
+        WHERE deleted = 0
+        ORDER BY role_id, create_time ASC
+    </select>
+
     <!-- 根据用户ID查询角色列表 -->
     <select id="selectDeptRolesByUserId" resultMap="deptRoleVOResultMap">
         SELECT 

schoolNewsWeb/src/apis/system/menu.ts

@@ -5,7 +5,7 @@
  */
 
 import { api } from '@/apis/index';
-import type { SysMenu, MenuTreeNode } from '@/types';
+import type { SysMenu, MenuTreeNode, SysPermission } from '@/types';
 
 /**
  * 菜单API服务
@@ -16,7 +16,7 @@ export const menuApi = {
    * @returns Promise<MenuTreeNode[]>
    */
   async getCurrentUserMenuTree(): Promise<MenuTreeNode[]> {
-    const response = await api.get<SysMenu>('/menu/user-tree');
+    const response = await api.get<SysMenu>('/menus/user-tree');
     return response.data.dataList! as MenuTreeNode[];
   },
 
@@ -24,8 +24,18 @@ export const menuApi = {
    * 获取所有菜单列表
    * @returns Promise<SysMenu[]>
    */
-  async getMenuList(): Promise<SysMenu[]> {
+  async getAllMenuList(): Promise<SysMenu[]> {
-    const response = await api.get<SysMenu>('/menu/list');
+    const response = await api.post<SysMenu>('/menus/all');
+    return response.data.dataList!;
+  },
+
+  /**
+   * 获取菜单列表
+   * @param filter 过滤条件
+   * @returns Promise<SysMenu[]>
+   */
+  async getMenuList(filter: SysMenu): Promise<SysMenu[]> {
+    const response = await api.post<SysMenu>('/menus/list', filter);
     return response.data.dataList!;
   },
 
@@ -34,17 +44,17 @@ export const menuApi = {
    * @returns Promise<MenuTreeNode[]>
    */
   async getMenuTree(): Promise<MenuTreeNode[]> {
-    const response = await api.get<SysMenu>('/menu/tree');
+    const response = await api.get<SysMenu>('/menus/tree');
     return response.data.dataList! as MenuTreeNode[];
   },
 
   /**
    * 根据ID获取菜单
-   * @param menuId 菜单ID
+   * @param menuID 菜单ID
    * @returns Promise<SysMenu>
    */
-  async getMenuById(menuId: string): Promise<SysMenu> {
+  async getMenuById(menuID: string): Promise<SysMenu> {
-    const response = await api.get<SysMenu>(`/menu/${menuId}`);
+    const response = await api.get<SysMenu>(`/menus`, {  menuID  });
     return response.data.data!;
   },
 
@@ -60,32 +70,42 @@ export const menuApi = {
 
   /**
    * 更新菜单
-   * @param menuId 菜单ID
+   * @param menuID 菜单ID
    * @param menu 菜单信息
    * @returns Promise<boolean>
    */
-  async updateMenu(menuId: string, menu: SysMenu): Promise<boolean> {
+  async updateMenu(menu: SysMenu): Promise<boolean> {
-    const response = await api.put<boolean>(`/menu/${menuId}`, menu);
+    const response = await api.put<boolean>(`/menus`, menu);
     return response.data.data!;
   },
 
   /**
    * 删除菜单
-   * @param menuId 菜单ID
+   * @param menuID 菜单ID
    * @returns Promise<boolean>
    */
-  async deleteMenu(menuId: string): Promise<boolean> {
+  async deleteMenu(menuID: string): Promise<boolean> {
-    const response = await api.delete<boolean>(`/menu/${menuId}`);
+    const response = await api.delete<boolean>(`/menus`, {  menuID  });
     return response.data.data!;
   },
 
   /**
    * 获取子菜单列表
-   * @param parentId 父菜单ID
+   * @param parentID 父菜单ID
    * @returns Promise<SysMenu[]>
    */
-  async getChildMenus(parentId: string): Promise<SysMenu[]> {
+  async getChildMenus(parentID: string): Promise<SysMenu[]> {
-    const response = await api.get<SysMenu>(`/menu/children/${parentId}`);
+    const response = await api.get<SysMenu>(`/menus/children`, {  parentID  });
+    return response.data.dataList!;
+  },
+
+  /**
+   * 获取菜单权限
+   * @param menuID 菜单ID
+   * @returns Promise<SysPermission[]>
+   */
+  async getMenuPermission(menuID: string): Promise<SysPermission[]> {
+    const response = await api.post<SysPermission>(`/menus/permission`, {  menuID  });
     return response.data.dataList!;
   }
 };

schoolNewsWeb/src/apis/system/permission.ts

@@ -62,5 +62,60 @@ export const permissionApi = {
   async getPermissionList(permission: SysPermission|null=null): Promise<SysPermission[]> {
     const response = await api.post<SysPermission>('/permissions/list', permission);
     return response.data.dataList!;
+  },
+
+  /**
+   * @description    获取权限绑定菜单
+   * @param    permission 权限
+   * @author    yslg
+   * @ since 2025-10-08
+   */
+  async getPermissionBindingList(permission: SysPermission): Promise<SysPermission> {
+    const response = await api.post<SysPermission>('/permissions/list/binding', permission);
+    return response.data.data!;
+  },
+
+  /**
+   * @description    绑定权限菜单
+   * @param    permission 权限
+   * @author    yslg
+   * @ since 2025-10-08
+   */
+  async bindMenu(permission: SysPermission): Promise<SysPermission> {
+    const response = await api.post<SysPermission>('/permissions/bind/menu', permission);
+    return response.data.data!;
+  },
+
+  /**
+   * @description    绑定权限角色
+   * @param    permission 权限
+   * @author    yslg
+   * @ since 2025-10-08
+   */
+  async bindRole(permission: SysPermission): Promise<SysPermission> {
+    const response = await api.post<SysPermission>('/permissions/bind/role', permission);
+    return response.data.data!;
+  },
+
+  /**
+   * @description    解绑权限菜单
+   * @param    permission 权限
+   * @author    yslg
+   * @ since 2025-10-08
+   */
+  async unbindMenu(permission: SysPermission): Promise<SysPermission> {
+    const response = await api.post<SysPermission>('/permissions/unbind/menu', permission);
+    return response.data.data!;
+  },
+
+  /**
+   * @description    解绑权限角色
+   * @param    permission 权限
+   * @author    yslg
+   * @ since 2025-10-08
+   */
+  async unbindRole(permission: SysPermission): Promise<SysPermission> {
+    const response = await api.post<SysPermission>('/permissions/unbind/role', permission);
+    return response.data.data!;
   }
 }

schoolNewsWeb/src/apis/system/role.ts

@@ -0,0 +1,16 @@
+import { api } from '@/apis/index';
+import type { SysRole } from '@/types';
+
+/**
+ * 菜单API服务
+ */
+export const roleApi = {
+    /**
+     * 获取所有角色列表
+     * @returns Promise<SysRole[]>
+     */
+    async getRoleList(): Promise<SysRole[]> {
+        const response = await api.post<SysRole>('/roles/all');
+        return response.data.dataList!;
+    }
+}

schoolNewsWeb/src/types/permission/index.ts

@@ -5,6 +5,8 @@
  */
 
 import { BaseDTO } from '../base';
+import { SysMenu } from '../menu';
+import { SysRole } from '../role';
 
 /**
  * 系统权限
@@ -26,5 +28,11 @@ export interface SysPermission extends BaseDTO {
   /** 更新人 */
   updater?: string;
   updaterName?: string;
+  /** 绑定类型 1.menu  2.role*/
+  bindType?: "menu" | "role";
+  /** 绑定列表 */
+  menus?: SysMenu[];
+  roles?: SysRole[];
+  permissions?: SysPermission[];
 }
 

schoolNewsWeb/src/views/manage/system/MenuManageView.vue

@@ -1,13 +1,668 @@
 <template>
-    <div>
+  <div class="menu-manage">
-        菜单管理
+    <div class="header">
+      <h2>菜单管理</h2>
+      <el-button type="primary" @click="handleAdd">
+        <el-icon><Plus /></el-icon>
+        新增菜单
+      </el-button>
+    </div>
+
+    <el-table 
+      :data="menuList" 
+      style="width: 100%" 
+      v-loading="loading"
+      border
+      stripe
+      row-key="menuID"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column prop="name" label="菜单名称" min-width="200" />
+      <el-table-column prop="menuID" label="菜单ID" min-width="150" />
+      <el-table-column prop="url" label="菜单路径" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="component" label="菜单组件" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="icon" label="菜单图标" width="100">
+        <template #default="{ row }">
+          <el-icon v-if="row.icon">
+            <component :is="row.icon" />
+          </el-icon>
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="80" />
+      <el-table-column prop="type" label="菜单类型" width="100">
+        <template #default="{ row }">
+          <el-tag :type="getMenuTypeTagType(row.type)" size="small">
+            {{ getMenuTypeText(row.type) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="creatorName" label="创建人" width="120" />
+      <el-table-column prop="createTime" label="创建时间" width="180" />
+      <el-table-column label="操作" width="280" fixed="right">
+        <template #default="{ row }">
+          <el-button 
+            type="primary" 
+            size="small" 
+            @click="handleAddChild(row)"
+            link
+          >
+            新增子菜单
+          </el-button>
+          <el-button 
+            type="primary" 
+            size="small" 
+            @click="handleEdit(row)"
+            link
+          >
+            编辑
+          </el-button>
+          <el-button 
+            type="primary" 
+            size="small" 
+            @click="handleBindPermission(row)"
+            link
+          >
+            绑定权限
+          </el-button>
+          <el-button 
+            type="danger" 
+            size="small" 
+            @click="handleDelete(row)"
+            link
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 新增/编辑对话框 -->
+    <el-dialog 
+      v-model="dialogVisible" 
+      :title="isEdit ? '编辑菜单' : '新增菜单'"
+      width="600px"
+      @close="resetForm"
+    >
+      <el-form 
+        ref="formRef"
+        :model="formData" 
+        :rules="formRules" 
+        label-width="100px"
+      >
+        <el-form-item label="父菜单" prop="parentID">
+          <el-cascader
+            v-model="formData.parentID"
+            :options="parentMenuOptions"
+            :props="cascaderProps"
+            placeholder="请选择父菜单"
+            clearable
+            style="width: 100%"
+          />
+        </el-form-item>
+        <el-form-item label="菜单名称" prop="name">
+          <el-input 
+            v-model="formData.name" 
+            placeholder="请输入菜单名称"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="菜单描述" prop="description">
+          <el-input 
+            v-model="formData.description" 
+            type="textarea"
+            :rows="3"
+            placeholder="请输入菜单描述"
+          />
+        </el-form-item>
+        <el-form-item label="菜单路径" prop="url">
+          <el-input 
+            v-model="formData.url" 
+            placeholder="请输入菜单路径"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="菜单组件" prop="component">
+          <el-input 
+            v-model="formData.component" 
+            placeholder="请输入菜单组件"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="菜单图标" prop="icon">
+          <el-input 
+            v-model="formData.icon" 
+            placeholder="请输入菜单图标"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="菜单类型" prop="type">
+          <el-select v-model="formData.type" placeholder="请选择菜单类型" style="width: 100%">
+            <el-option label="侧边栏" :value="0" />
+            <el-option label="导航栏" :value="1" />
+            <el-option label="按钮" :value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序" prop="orderNum">
+          <el-input-number 
+            v-model="formData.orderNum" 
+            :min="0"
+            :max="999"
+            placeholder="请输入排序"
+            style="width: 100%"
+          />
+        </el-form-item>
+      </el-form>
+      
+      <template #footer>
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button 
+          type="primary" 
+          @click="handleSubmit"
+          :loading="submitting"
+        >
+          确定
+        </el-button>
+      </template>
+    </el-dialog>
+
+    <!-- 绑定权限对话框 -->
+    <el-dialog v-model="bindPermissionDialogVisible" title="绑定权限" width="800px" @close="resetBindList">
+      <div class="permission-binding-container">
+        <!-- 菜单信息显示 -->
+        <div class="menu-info" v-if="currentMenu">
+          <h4>菜单信息：{{ currentMenu.name }}</h4>
+          <p>菜单ID：{{ currentMenu.menuID }}</p>
+        </div>
+        
+        <!-- 权限绑定状态表格 -->
+        <el-table :data="permissionList" style="width: 100%" border stripe>
+          <el-table-column width="80" label="绑定状态">
+            <template #default="{ row }">
+              <el-tag 
+                :type="isPermissionSelected(row.permissionID) ? 'success' : 'info'"
+                size="small"
+              >
+                {{ isPermissionSelected(row.permissionID) ? '已绑定' : '未绑定' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="权限名称" min-width="150" />
+          <el-table-column prop="permissionID" label="权限ID" min-width="120" />
+          <el-table-column prop="code" label="权限编码" min-width="150" />
+          <el-table-column prop="description" label="权限描述" min-width="200" show-overflow-tooltip />
+          <el-table-column label="操作" width="100">
+            <template #default="{ row }">
+              <el-button 
+                :type="isPermissionSelected(row.permissionID) ? 'danger' : 'primary'"
+                size="small"
+                @click="togglePermissionSelection(row)"
+              >
+                {{ isPermissionSelected(row.permissionID) ? '解绑' : '绑定' }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        
+        <!-- 统计信息 -->
+        <div class="binding-stats">
+          <el-alert 
+            :title="`已绑定 ${selectedPermissions.length} 个权限，未绑定 ${permissionList.length - selectedPermissions.length} 个权限`"
+            type="info"
+            :closable="false"
+            show-icon
+          />
+        </div>
+      </div>
+      
+      <template #footer>
+        <el-button @click="bindPermissionDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="savePermissionBinding" :loading="submitting">
+          保存
+        </el-button>
+      </template>
+    </el-dialog>
     </div>
 </template>
 
 <script setup lang="ts">
+import { menuApi } from '@/apis/system/menu';
+import { permissionApi } from '@/apis/system/permission';
+import { SysMenu, SysPermission } from '@/types';
+import { ref, onMounted, reactive, computed } from 'vue';
+import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus';
+import { Plus } from '@element-plus/icons-vue';
 
+// 数据状态
+const menuList = ref<SysMenu[]>([]);
+const loading = ref(false);
+const submitting = ref(false);
+
+// 权限绑定相关数据
+const permissionList = ref<SysPermission[]>([]);
+const selectedPermissions = ref<string[]>([]);
+const currentMenu = ref<SysMenu | null>(null);
+const bindList = ref<{ permissions: SysPermission[] }>({
+  permissions: []
+});
+
+// 对话框状态
+const dialogVisible = ref(false);
+const isEdit = ref(false);
+const formRef = ref<FormInstance>();
+const bindPermissionDialogVisible = ref(false);
+
+// 表单数据
+const formData = reactive<SysMenu>({
+  name: '',
+  description: '',
+  url: '',
+  component: '',
+  icon: '',
+  type: 0,
+  orderNum: 0,
+  parentID: undefined
+});
+
+// 表单验证规则
+const formRules: FormRules = {
+  name: [
+    { required: true, message: '请输入菜单名称', trigger: 'blur' },
+    { min: 2, max: 50, message: '菜单名称长度在 2 到 50 个字符', trigger: 'blur' }
+  ],
+  url: [
+    { max: 200, message: '菜单路径不能超过 200 个字符', trigger: 'blur' }
+  ],
+  component: [
+    { max: 200, message: '菜单组件不能超过 200 个字符', trigger: 'blur' }
+  ],
+  type: [
+    { required: true, message: '请选择菜单类型', trigger: 'change' }
+  ]
+};
+
+// 级联选择器配置
+const cascaderProps = {
+  value: 'menuID',
+  label: 'name',
+  children: 'children',
+  checkStrictly: true
+};
+
+// 父菜单选项
+const parentMenuOptions = computed(() => {
+  return buildParentMenuOptions(menuList.value);
+});
+
+// 构建父菜单选项
+function buildParentMenuOptions(menus: SysMenu[]): any[] {
+  return menus.map(menu => ({
+    menuID: menu.menuID,
+    name: menu.name,
+    children: menu.children ? buildParentMenuOptions(menu.children) : undefined
+  }));
+}
+
+// 获取菜单类型标签类型
+function getMenuTypeTagType(type: number | undefined): string {
+  switch (type) {
+    case 0: return 'primary';
+    case 1: return 'success';
+    case 2: return 'warning';
+    default: return 'info';
+  }
+}
+
+// 获取菜单类型文本
+function getMenuTypeText(type: number | undefined): string {
+  switch (type) {
+    case 0: return '侧边栏';
+    case 1: return '导航栏';
+    case 2: return '按钮';
+    default: return '未知';
+  }
+}
+
+// 加载菜单列表
+async function loadMenuList() {
+  try {
+    loading.value = true;
+    menuList.value = await menuApi.getAllMenuList();
+  } catch (error) {
+    console.error('加载菜单列表失败:', error);
+    ElMessage.error('加载菜单列表失败');
+  } finally {
+    loading.value = false;
+  }
+}
+
+// 新增菜单
+function handleAdd() {
+  isEdit.value = false;
+  formData.parentID = undefined;
+  dialogVisible.value = true;
+}
+
+// 新增子菜单
+function handleAddChild(row: SysMenu) {
+  isEdit.value = false;
+  formData.parentID = row.menuID;
+  dialogVisible.value = true;
+}
+
+// 编辑菜单
+function handleEdit(row: SysMenu) {
+  isEdit.value = true;
+  Object.assign(formData, row);
+  dialogVisible.value = true;
+}
+
+// 删除菜单
+async function handleDelete(row: SysMenu) {
+  try {
+    await ElMessageBox.confirm(
+      `确定要删除菜单 "${row.name}" 吗？`,
+      '删除确认',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+    );
+    
+    await menuApi.deleteMenu(row.menuID!);
+    ElMessage.success('删除成功');
+    await loadMenuList();
+  } catch (error) {
+    if (error !== 'cancel') {
+      console.error('删除菜单失败:', error);
+      ElMessage.error('删除菜单失败');
+    }
+  }
+}
+
+// 提交表单
+async function handleSubmit() {
+  if (!formRef.value) return;
+  
+  try {
+    await formRef.value.validate();
+    submitting.value = true;
+    
+    if (isEdit.value) {
+      await menuApi.updateMenu(formData);
+      ElMessage.success('更新成功');
+    } else {
+      await menuApi.createMenu(formData);
+      ElMessage.success('新增成功');
+    }
+    
+    dialogVisible.value = false;
+    await loadMenuList();
+  } catch (error) {
+    if (error !== false) { // 表单验证失败时error为false
+      console.error('提交失败:', error);
+      ElMessage.error(isEdit.value ? '更新失败' : '新增失败');
+    }
+  } finally {
+    submitting.value = false;
+  }
+}
+
+// 重置表单
+function resetForm() {
+  if (formRef.value) {
+    formRef.value.resetFields();
+  }
+  Object.assign(formData, {
+    name: '',
+    description: '',
+    url: '',
+    component: '',
+    icon: '',
+    type: 0,
+    orderNum: 0,
+    parentID: undefined
+  });
+}
+
+// 查看绑定权限
+async function handleBindPermission(row: SysMenu) {
+  currentMenu.value = row;
+  
+  try {
+    // 获取所有权限
+    let permission:SysPermission = {
+        permissionID: undefined,
+        name: undefined,
+        code: undefined,
+        description: undefined,
+    };
+    permissionList.value = await permissionApi.getPermissionList(permission);
+    
+    // 获取已绑定的权限
+    const bindingResult = await menuApi.getMenuPermission(row.menuID!);
+    bindList.value.permissions = bindingResult || [];
+    
+    // 设置已选中的权限
+    selectedPermissions.value = bindList.value.permissions.map(permission => permission.permissionID).filter((id): id is string => !!id);
+    
+    console.log('已绑定的权限:', bindList.value.permissions);
+    console.log('所有权限:', permissionList.value);
+    bindPermissionDialogVisible.value = true;
+  } catch (error) {
+    console.error('获取权限绑定信息失败:', error);
+    ElMessage.error('获取权限绑定信息失败');
+  }
+}
+
+// 重置绑定列表
+function resetBindList() {
+  bindList.value = {
+    permissions: []
+  };
+  selectedPermissions.value = [];
+  currentMenu.value = null;
+}
+
+// 检查权限是否已选中
+function isPermissionSelected(permissionID: string | undefined): boolean {
+  return permissionID ? selectedPermissions.value.includes(permissionID) : false;
+}
+
+// 切换权限选择状态
+function togglePermissionSelection(permission: SysPermission) {
+  if (!permission.permissionID) return;
+  
+  const index = selectedPermissions.value.indexOf(permission.permissionID);
+  if (index > -1) {
+    selectedPermissions.value.splice(index, 1);
+  } else {
+    selectedPermissions.value.push(permission.permissionID);
+  }
+}
+
+// 保存权限绑定
+async function savePermissionBinding() {
+  if (!currentMenu.value || !currentMenu.value.menuID) {
+    ElMessage.error('菜单信息不完整');
+    return;
+  }
+  
+  try {
+    submitting.value = true;
+    
+    // 获取当前已绑定的权限ID
+    const currentBoundPermissions = (bindList.value.permissions || []).map(permission => permission.permissionID).filter((id): id is string => !!id);
+    
+    // 找出需要绑定的权限（新增的）
+    const permissionsToBind = selectedPermissions.value.filter(permissionID => !currentBoundPermissions.includes(permissionID));
+    
+    // 找出需要解绑的权限（移除的）
+    const permissionsToUnbind = currentBoundPermissions.filter(permissionID => !selectedPermissions.value.includes(permissionID));
+    
+    // 构建需要绑定的权限对象数组
+    if (permissionsToBind.length > 0) {
+      const permissionsToBindObjects = permissionsToBind.map(permissionID => {
+        const permission = permissionList.value.find(p => p.permissionID === permissionID);
+        return permission || { permissionID: permissionID };
+      });
+      
+      const bindMenu = {
+        ...currentMenu.value,
+        permissions: permissionsToBindObjects,
+        menus: [{menuID: currentMenu.value.menuID}]
+      };
+      await permissionApi.bindMenu(bindMenu);
+    }
+    
+    // 构建需要解绑的权限对象数组
+    if (permissionsToUnbind.length > 0) {
+      const permissionsToUnbindObjects = permissionsToUnbind.map(permissionID => {
+        const permission = permissionList.value.find(p => p.permissionID === permissionID);
+        return permission || { permissionID: permissionID };
+      });
+      
+      const unbindMenu = {
+        ...currentMenu.value,
+        permissions: permissionsToUnbindObjects,
+        menus: [{menuID: currentMenu.value.menuID}]
+      };
+      await permissionApi.unbindMenu(unbindMenu);
+    }
+    
+    ElMessage.success('权限绑定保存成功');
+    bindPermissionDialogVisible.value = false;
+    
+    // 刷新菜单列表
+    await loadMenuList();
+  } catch (error) {
+    console.error('保存权限绑定失败:', error);
+    ElMessage.error('保存权限绑定失败');
+  } finally {
+    submitting.value = false;
+  }
+}
+
+// 页面加载时获取菜单列表
+onMounted(() => {
+  loadMenuList();
+});
 </script>
 
 <style scoped lang="scss">
+.menu-manage {
+  padding: 20px;
   
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 20px;
+    
+    h2 {
+      margin: 0;
+      color: #303133;
+      font-size: 20px;
+      font-weight: 600;
+    }
+  }
+  
+  .el-table {
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    border-radius: 4px;
+  }
+}
+
+// 对话框样式优化
+:deep(.el-dialog) {
+  .el-dialog__header {
+    padding: 20px 20px 10px;
+    border-bottom: 1px solid #ebeef5;
+    
+    .el-dialog__title {
+      font-size: 16px;
+      font-weight: 600;
+      color: #303133;
+    }
+  }
+  
+  .el-dialog__body {
+    padding: 20px;
+  }
+  
+  .el-dialog__footer {
+    padding: 10px 20px 20px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+
+// 表单样式优化
+:deep(.el-form) {
+  .el-form-item__label {
+    font-weight: 500;
+    color: #606266;
+  }
+  
+  .el-input__wrapper {
+    box-shadow: 0 0 0 1px #dcdfe6 inset;
+    
+    &:hover {
+      box-shadow: 0 0 0 1px #c0c4cc inset;
+    }
+    
+    &.is-focus {
+      box-shadow: 0 0 0 1px #409eff inset;
+    }
+  }
+  
+  .el-textarea__inner {
+    box-shadow: 0 0 0 1px #dcdfe6 inset;
+    
+    &:hover {
+      box-shadow: 0 0 0 1px #c0c4cc inset;
+    }
+    
+    &:focus {
+      box-shadow: 0 0 0 1px #409eff inset;
+    }
+  }
+}
+
+// 按钮样式优化
+:deep(.el-button) {
+  &.is-link {
+    padding: 0;
+    margin-right: 12px;
+    
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+}
+
+// 权限绑定容器样式
+.permission-binding-container {
+  .menu-info {
+    background: #f5f7fa;
+    padding: 15px;
+    border-radius: 4px;
+    margin-bottom: 20px;
+    
+    h4 {
+      margin: 0 0 8px 0;
+      color: #303133;
+      font-size: 16px;
+    }
+    
+    p {
+      margin: 0;
+      color: #606266;
+      font-size: 14px;
+    }
+  }
+  
+  .binding-stats {
+    margin-top: 20px;
+  }
+}
 </style>

schoolNewsWeb/src/views/manage/system/PermissionManageView.vue

@@ -31,7 +31,7 @@
             编辑
           </el-button>
           <el-button 
-            type="danger" 
+            type="primary" 
             size="small" 
             @click="handleBindMenu(row)"
             link
@@ -39,7 +39,7 @@
             绑定菜单
           </el-button>
           <el-button 
-            type="danger" 
+            type="primary" 
             size="small" 
             @click="handleBindRole(row)"
             link
@@ -106,12 +106,127 @@
         </el-button>
       </template>
     </el-dialog>
+
+    <!-- 绑定菜单对话框 -->
+    <el-dialog v-model="bindMenuDialogVisible" title="绑定菜单" width="800px" @close="resetBindList">
+      <div class="menu-binding-container">
+        <!-- 权限信息显示 -->
+        <div class="permission-info" v-if="currentPermission">
+          <h4>权限信息：{{ currentPermission.name }}</h4>
+          <p>权限编码：{{ currentPermission.code }}</p>
+        </div>
+        
+        <!-- 菜单绑定状态表格 -->
+        <el-table :data="menuList" style="width: 100%" border stripe>
+          <el-table-column width="80" label="绑定状态">
+            <template #default="{ row }">
+              <el-tag 
+                :type="isMenuSelected(row.menuID) ? 'success' : 'info'"
+                size="small"
+              >
+                {{ isMenuSelected(row.menuID) ? '已绑定' : '未绑定' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="菜单名称" min-width="150" />
+          <el-table-column prop="menuID" label="菜单ID" min-width="120" />
+          <el-table-column prop="url" label="菜单路径" min-width="200" show-overflow-tooltip />
+          <el-table-column prop="component" label="菜单组件" min-width="180" show-overflow-tooltip />
+          <el-table-column label="操作" width="100">
+            <template #default="{ row }">
+              <el-button 
+                :type="isMenuSelected(row.menuID) ? 'danger' : 'primary'"
+                size="small"
+                @click="toggleMenuSelection(row)"
+              >
+                {{ isMenuSelected(row.menuID) ? '解绑' : '绑定' }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        
+        <!-- 统计信息 -->
+        <div class="binding-stats">
+          <el-alert 
+            :title="`已绑定 ${selectedMenus.length} 个菜单，未绑定 ${menuList.length - selectedMenus.length} 个菜单`"
+            type="info"
+            :closable="false"
+            show-icon
+          />
+        </div>
+      </div>
+      
+      <template #footer>
+        <el-button @click="bindMenuDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveMenuBinding" :loading="submitting">
+          保存
+        </el-button>
+      </template>
+    </el-dialog>
+
+    <!-- 绑定角色对话框 -->
+    <el-dialog v-model="bindRoleDialogVisible" title="绑定角色" width="800px" @close="resetBindList">
+      <div class="role-binding-container">
+        <!-- 权限信息显示 -->
+        <div class="permission-info" v-if="currentPermission">
+          <h4>权限信息：{{ currentPermission.name }}</h4>
+          <p>权限编码：{{ currentPermission.code }}</p>
+        </div>
+        
+        <!-- 角色绑定状态表格 -->
+        <el-table :data="roleList" style="width: 100%" border stripe>
+          <el-table-column width="80" label="绑定状态">
+            <template #default="{ row }">
+              <el-tag 
+                :type="isRoleSelected(row.id) ? 'success' : 'info'"
+                size="small"
+              >
+                {{ isRoleSelected(row.id) ? '已绑定' : '未绑定' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="角色名称" min-width="150" />
+          <el-table-column prop="id" label="角色ID" min-width="120" />
+          <el-table-column prop="description" label="角色描述" min-width="200" show-overflow-tooltip />
+          <el-table-column label="操作" width="100">
+            <template #default="{ row }">
+              <el-button 
+                :type="isRoleSelected(row.id) ? 'danger' : 'primary'"
+                size="small"
+                @click="toggleRoleSelection(row)"
+              >
+                {{ isRoleSelected(row.id) ? '解绑' : '绑定' }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        
+        <!-- 统计信息 -->
+        <div class="binding-stats">
+          <el-alert 
+            :title="`已绑定 ${selectedRoles.length} 个角色，未绑定 ${roleList.length - selectedRoles.length} 个角色`"
+            type="info"
+            :closable="false"
+            show-icon
+          />
+        </div>
+      </div>
+      
+      <template #footer>
+        <el-button @click="bindRoleDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveRoleBinding" :loading="submitting">
+          保存
+        </el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
 import { permissionApi } from '@/apis/system/permission';
-import { SysPermission } from '@/types';
+import { roleApi } from '@/apis/system/role';
+import { menuApi } from '@/apis/system/menu';
+import { SysPermission, SysRole, SysMenu } from '@/types';
 import { ref, onMounted, reactive } from 'vue';
 import { ElMessage, ElMessageBox, FormInstance, FormRules } from 'element-plus';
 import { Plus } from '@element-plus/icons-vue';
@@ -120,11 +235,21 @@ import { Plus } from '@element-plus/icons-vue';
 const permissionList = ref<SysPermission[]>([]);
 const loading = ref(false);
 const submitting = ref(false);
-
+const bindList = ref<SysPermission>({
+  menus: [],
+  roles: []
+});
+const roleList = ref<SysRole[]>([]);
+const menuList = ref<SysMenu[]>([]);
+const selectedMenus = ref<string[]>([]);
+const selectedRoles = ref<string[]>([]);
+const currentPermission = ref<SysPermission | null>(null);
 // 对话框状态
 const dialogVisible = ref(false);
 const isEdit = ref(false);
 const formRef = ref<FormInstance>();
+const bindMenuDialogVisible = ref(false);
+const bindRoleDialogVisible = ref(false);
 
 const queryFilter = ref<SysPermission>({
   name: '',
@@ -186,13 +311,53 @@ function handleEdit(row: SysPermission) {
 }
 
 // 查看绑定菜单
-function handleBindMenu(row: SysPermission) {
+async function handleBindMenu(row: SysPermission) {
-  console.log(row);
+  currentPermission.value = row;
+  row.bindType = "menu";
+  
+  try {
+    // 获取已绑定的菜单
+    const bindingResult = await permissionApi.getPermissionBindingList(row);
+    bindList.value.menus = bindingResult.menus || [];
+    
+    // 获取所有菜单
+    menuList.value = await menuApi.getAllMenuList();
+    
+    // 设置已选中的菜单
+    selectedMenus.value = bindList.value.menus.map(menu => menu.menuID).filter((id): id is string => !!id);
+    
+    console.log('已绑定的菜单:', bindList.value.menus);
+    console.log('所有菜单:', menuList.value);
+    bindMenuDialogVisible.value = true;
+  } catch (error) {
+    console.error('获取菜单绑定信息失败:', error);
+    ElMessage.error('获取菜单绑定信息失败');
+  }
 }
 
 // 查看绑定角色
-function handleBindRole(row: SysPermission) {
+async function handleBindRole(row: SysPermission) {
-  console.log(row);
+  currentPermission.value = row;
+  row.bindType = "role";
+  
+  try {
+    // 获取已绑定的角色
+    const bindingResult = await permissionApi.getPermissionBindingList(row);
+    bindList.value.roles = bindingResult.roles || [];
+    
+    // 获取所有角色
+    roleList.value = await roleApi.getRoleList();
+    
+    // 设置已选中的角色
+    selectedRoles.value = bindList.value.roles.map(role => role.id).filter((id): id is string => !!id);
+    
+    console.log('已绑定的角色:', bindList.value.roles);
+    console.log('所有角色:', roleList.value);
+    bindRoleDialogVisible.value = true;
+  } catch (error) {
+    console.error('获取角色绑定信息失败:', error);
+    ElMessage.error('获取角色绑定信息失败');
+  }
 }
 
 // 删除权限
@@ -219,6 +384,175 @@ async function handleDelete(row: SysPermission) {
   }
 }
 
+// 重置绑定列表
+function resetBindList() {
+  bindList.value = {
+    menus: [],
+    roles: []
+  };
+  selectedMenus.value = [];
+  selectedRoles.value = [];
+  currentPermission.value = null;
+}
+
+// 检查菜单是否已选中
+function isMenuSelected(menuID: string | undefined): boolean {
+  return menuID ? selectedMenus.value.includes(menuID) : false;
+}
+
+// 切换菜单选择状态
+function toggleMenuSelection(menu: SysMenu) {
+  if (!menu.menuID) return;
+  
+  const index = selectedMenus.value.indexOf(menu.menuID);
+  if (index > -1) {
+    selectedMenus.value.splice(index, 1);
+  } else {
+    selectedMenus.value.push(menu.menuID);
+  }
+}
+
+// 保存菜单绑定
+async function saveMenuBinding() {
+  if (!currentPermission.value || !currentPermission.value.permissionID) {
+    ElMessage.error('权限信息不完整');
+    return;
+  }
+  
+  try {
+    submitting.value = true;
+    
+    // 获取当前已绑定的菜单ID
+    const currentBoundMenus = (bindList.value.menus || []).map(menu => menu.menuID).filter((id): id is string => !!id);
+    
+    // 找出需要绑定的菜单（新增的）
+    const menusToBind = selectedMenus.value.filter(menuID => !currentBoundMenus.includes(menuID));
+    
+    // 找出需要解绑的菜单（移除的）
+    const menusToUnbind = currentBoundMenus.filter(menuID => !selectedMenus.value.includes(menuID));
+    
+    // 构建需要绑定的菜单对象数组
+    if (menusToBind.length > 0) {
+      const menusToBindObjects = menusToBind.map(menuID => {
+        const menu = menuList.value.find(m => m.menuID === menuID);
+        return menu || { menuID: menuID };
+      });
+      
+      const bindPermission = {
+        ...currentPermission.value,
+        menus: menusToBindObjects,
+        permissions: [{permissionID: currentPermission.value.permissionID}]
+      };
+      await permissionApi.bindMenu(bindPermission);
+    }
+    
+    // 构建需要解绑的菜单对象数组
+    if (menusToUnbind.length > 0) {
+      const menusToUnbindObjects = menusToUnbind.map(menuID => {
+        const menu = menuList.value.find(m => m.menuID === menuID);
+        return menu || { menuID: menuID };
+      });
+      
+      const unbindPermission = {
+        ...currentPermission.value,
+        menus: menusToUnbindObjects,
+        permissions: [{permissionID: currentPermission.value.permissionID}]
+      };
+      await permissionApi.unbindMenu(unbindPermission);
+    }
+    
+    ElMessage.success('菜单绑定保存成功');
+    bindMenuDialogVisible.value = false;
+    
+    // 刷新权限列表
+    await loadPermissionList();
+  } catch (error) {
+    console.error('保存菜单绑定失败:', error);
+    ElMessage.error('保存菜单绑定失败');
+  } finally {
+    submitting.value = false;
+  }
+}
+
+// 检查角色是否已选中
+function isRoleSelected(roleID: string | undefined): boolean {
+  return roleID ? selectedRoles.value.includes(roleID) : false;
+}
+
+// 切换角色选择状态
+function toggleRoleSelection(role: SysRole) {
+  if (!role.id) return;
+  
+  const index = selectedRoles.value.indexOf(role.id);
+  if (index > -1) {
+    selectedRoles.value.splice(index, 1);
+  } else {
+    selectedRoles.value.push(role.id);
+  }
+}
+
+// 保存角色绑定
+async function saveRoleBinding() {
+  if (!currentPermission.value || !currentPermission.value.permissionID) {
+    ElMessage.error('权限信息不完整');
+    return;
+  }
+  
+  try {
+    submitting.value = true;
+    
+    // 获取当前已绑定的角色ID
+    const currentBoundRoles = (bindList.value.roles || []).map(role => role.id).filter((id): id is string => !!id);
+    
+    // 找出需要绑定的角色（新增的）
+    const rolesToBind = selectedRoles.value.filter(roleID => !currentBoundRoles.includes(roleID));
+    
+    // 找出需要解绑的角色（移除的）
+    const rolesToUnbind = currentBoundRoles.filter(roleID => !selectedRoles.value.includes(roleID));
+    
+    // 构建需要绑定的角色对象数组
+    if (rolesToBind.length > 0) {
+      const rolesToBindObjects = rolesToBind.map(roleID => {
+        const role = roleList.value.find(r => r.id === roleID);
+        return role || { id: roleID };
+      });
+      
+      const bindPermission = {
+        ...currentPermission.value,
+        roles: rolesToBindObjects,
+        permissions: [{permissionID: currentPermission.value.permissionID}]
+      };
+      await permissionApi.bindRole(bindPermission);
+    }
+    
+    // 构建需要解绑的角色对象数组
+    if (rolesToUnbind.length > 0) {
+      const rolesToUnbindObjects = rolesToUnbind.map(roleID => {
+        const role = roleList.value.find(r => r.id === roleID);
+        return role || { id: roleID };
+      });
+      
+      const unbindPermission = {
+        ...currentPermission.value,
+        roles: rolesToUnbindObjects,
+        permissions: [{permissionID: currentPermission.value.permissionID}]
+      };
+      await permissionApi.unbindRole(unbindPermission);
+    }
+    
+    ElMessage.success('角色绑定保存成功');
+    bindRoleDialogVisible.value = false;
+    
+    // 刷新权限列表
+    await loadPermissionList();
+  } catch (error) {
+    console.error('保存角色绑定失败:', error);
+    ElMessage.error('保存角色绑定失败');
+  } finally {
+    submitting.value = false;
+  }
+}
+
 // 提交表单
 async function handleSubmit() {
   if (!formRef.value) return;
@@ -355,4 +689,30 @@ onMounted(() => {
     }
   }
 }
+
+.menu-binding-container,
+.role-binding-container {
+  .permission-info {
+    background: #f5f7fa;
+    padding: 15px;
+    border-radius: 4px;
+    margin-bottom: 20px;
+    
+    h4 {
+      margin: 0 0 8px 0;
+      color: #303133;
+      font-size: 16px;
+    }
+    
+    p {
+      margin: 0;
+      color: #606266;
+      font-size: 14px;
+    }
+  }
+  
+  .binding-stats {
+    margin-top: 20px;
+  }
+}
 </style>