权限管理-列表查询6

fiveep-persistence/src/main/resources/mapper/mysql/system/SysRoleMapper.xml

@@ -158,10 +158,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			`status` = 0
 		  AND visible = 0
 		  AND menu_type = #{menuType}
-		  AND parent_id IN
+		  AND menu_id IN
 		<foreach collection="roleId" item="item" open="(" separator="," close=")">
 			#{item}
 		</foreach>
+		group by parent_id
 	</select>
  	
 </mapper> 

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysRoleServiceImpl.java

@@ -232,20 +232,28 @@ public class SysRoleServiceImpl implements ISysRoleService
     {
         Long[] arr = role.getMenuIds();
         //菜单ID
-        List<SysMenu> menuIdList = roleMapper.getMenuIdList(arr, "C");
+        List<SysMenu> menuIdList = roleMapper.getMenuIdList(arr, "F");
         Long arr1[] = new Long[menuIdList.size()];
         for (int i=0;i<menuIdList.size();i++){
-            arr1[i] = menuIdList.get(i).getMenuId();
-            arr[arr.length] = menuIdList.get(i).getMenuId();
+            arr1[i] = menuIdList.get(i).getParentId();
         }
         //目录ID
-        List<SysMenu> menuIdListOne = roleMapper.getMenuIdList(arr1, "M");
+        List<SysMenu> menuIdListOne = roleMapper.getMenuIdList(arr1, "C");
         Long arr2[] = new Long[menuIdList.size()];
         for (int i=0;i<menuIdListOne.size();i++){
-//            arr2[i] = menuIdListOne.get(i).getMenuId();
-            arr[arr.length] = menuIdListOne.get(i).getMenuId();
+            arr2[i] = menuIdListOne.get(i).getParentId();
         }
-        role.setMenuIds(arr);
+        Long arr3[] = new Long[arr1.length+arr2.length+arr.length];
+        for (int i=0;i<arr1.length;i++){
+            arr3[i] = arr1[i];
+        }
+        for (int i=0;i<arr2.length;i++){
+            arr3[i+arr1.length] = arr2[i];
+        }
+        for (int i=0;i<arr.length;i++){
+            arr3[i+arr1.length+arr2.length] = arr[i];
+        }
+        role.setMenuIds(arr3);
 
         // 修改角色信息
         roleMapper.updateRole(role);