提交数据库设计

src/main/resources/mapper/SysMenuMapper.xml

@@ -4,26 +4,24 @@
     <resultMap id="SysMenuResultMap" type="com.labelsys.backend.entity.SysMenu">
         <id column="id" property="id"/>
         <result column="company_id" property="companyId"/>
-        <result column="permission_code" property="permissionCode"/>
         <result column="menu_code" property="menuCode"/>
         <result column="menu_name" property="menuName"/>
         <result column="path" property="path"/>
+        <result column="visible_positions" property="visiblePositions"/>
         <result column="sort_order" property="sortOrder"/>
         <result column="created_at" property="createdAt"/>
         <result column="updated_at" property="updatedAt"/>
     </resultMap>
 
     <select id="listCurrentMenus" resultMap="SysMenuResultMap">
-        select distinct m.id, m.company_id, m.permission_code, m.menu_code, m.menu_name, m.path, m.sort_order, m.created_at, m.updated_at
+        select m.id, m.company_id, m.menu_code, m.menu_name, m.path, m.visible_positions, m.sort_order, m.created_at, m.updated_at
         from sys_menu m
-        inner join sys_position_permission pp
-            on pp.company_id = m.company_id
-           and pp.permission_code = m.permission_code
         where m.company_id = #{companyId}
-          and pp.position_code in
-          <foreach collection="positionCodes" item="positionCode" open="(" separator="," close=")">
-              #{positionCode}
+          and (
+          <foreach collection="visiblePositions" item="positionCode" separator=" or ">
+              concat(',', m.visible_positions, ',') like concat('%,', #{positionCode}, ',%')
           </foreach>
+          )
         order by m.sort_order, m.id
     </select>
 </mapper>