权限管理-列表查询4

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

@@ -162,17 +162,17 @@
 	</select>
 
 
-	<select id="getMenuListOne" parameterType="com.bizmatics.model.system.SysMenu">
+	<select id="getMenuListOne" resultType="com.bizmatics.model.system.SysMenu">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 		left join sys_role_menu rm on m.menu_id = rm.menu_id
 		left join sys_user_role ur on rm.role_id = ur.role_id
 		left join sys_role ro on ur.role_id = ro.role_id
 		where ur.user_id = #{userId}
-			AND visible = 0
-			AND status = 0
-		<if test="status != null and status != ''">
-			AND menu_type = #{menuType}
+			AND m.visible = 0
+			AND m.status = 0
+		<if test="menuType != null and menuType != ''">
+			AND m.menu_type = #{menuType}
 		</if>
 		order by m.parent_id, m.order_num
 	</select>

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

@@ -159,9 +159,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  AND visible = 0
 		  AND menu_type = #{menuType}
 		  AND parent_id IN
-		<foreach collection="array" item="roleId" open="(" separator="," close=")">
-			#{roleId}
-		</foreach> ;
+		<foreach collection="roleId" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
 	</select>
  	
 </mapper> 

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

@@ -279,7 +279,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
         List<SysMenu> sysMenuListOne = new ArrayList<>();
         List<SysMenu> sysMenuListThree = new ArrayList<>();
         List<SysMenu> sysMenuListFour = new ArrayList<>();
-        if (SysUser.isAdmin(loginUser.getUser().getUserId())) {
+        if (roleId==1) {
             //全部目录查询
             sysMenuListTwo = menuMapper.getSysMenuList("M");
             //全部菜单查询
@@ -310,13 +310,12 @@ public class SysMenuServiceImpl implements ISysMenuService {
             sysMenuTwoVo.setName(sysMenuListThree.get(i).getMenuName());
             sysMenuTwoVo.setFid(sysMenuListThree.get(i).getParentId());
             long Id = sysMenuListThree.get(i).getMenuId();
+            sysMenuTwoVo.setChecked(false);
             if (sysMenuListFour.size() > 0) {
                 for (int j = 0; j < sysMenuListFour.size(); j++) {
                     long MenuId = sysMenuListFour.get(j).getMenuId();
                     if (Id == MenuId) {
                         sysMenuTwoVo.setChecked(true);
-                    } else {
-                        sysMenuTwoVo.setChecked(false);
                     }
                 }
             } else {