修改了查询菜单权限的返回值

chuanyi_server/src/main/java/com/judong/chuanyiserver/entity/Permission.java

@@ -21,4 +21,9 @@ public class Permission implements Serializable {
      * 权限名称
      */
     private String permissionName;
+
+    /**
+     * 菜单名（权限来源）
+     */
+    private String menuName;
 }

chuanyi_server/src/main/resources/mapper/MenuDao.xml

@@ -244,14 +244,17 @@
     </select>
 
     <select id="getPermissionListByMenuListPage" resultType="com.judong.chuanyiserver.entity.Permission">
-        select distinct(smp.permission_id), sp.id, sp.permission_url, sp.permission_name
+        select sm.menu_name, sp.id, sp.permission_url, sp.permission_name
         from sys_permission sp
         inner join sys_menu_permission smp on sp.id = smp.permission_id
+        JOIN sys_menu sm
+        ON smp.menu_id=sm.id
         where smp.menu_id in (
         <foreach collection="menuList" item="menu" index="index" separator=",">
             #{menu.id}
         </foreach>
         )
+        ORDER BY smp.menu_id ASC
         limit #{page},#{num}
     </select>
 
@@ -259,6 +262,8 @@
         select COUNT(*)
         from sys_permission sp
         inner join sys_menu_permission smp on sp.id = smp.permission_id
+        JOIN sys_menu sm
+        ON smp.menu_id=sm.id
         where smp.menu_id in (
         <foreach collection="menuList" item="menu" index="index" separator=",">
             #{menu.id}