菜单绑定

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