权限管理-列表查询7

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/system/SysMenuMapper.java

@@ -71,6 +71,7 @@ public interface SysMenuMapper
      * @return
      */
     public List<SysMenu> getButtonlist(Long userId, String menuName,Long roleId);
+    public List<SysMenu> getButtonlistTwo(Long userId, String menuName,Long roleId);
 
     public List<SysMenu> getButtonlistOne(String menuName);
 

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

@@ -119,6 +119,25 @@
 		order by a.parent_id, a.order_num
 	</select>
 
+	<select id="getButtonlistTwo"  resultType="com.bizmatics.model.system.SysMenu" >
+		SELECT
+		a.*
+		FROM
+		sys_menu a
+		JOIN sys_role_menu b ON a.menu_id = b.menu_id
+		JOIN sys_role d ON b.role_id = d.role_id
+		WHERE
+		a. STATUS = 0
+		AND d. STATUS = 0
+		<if test="roleId != null and roleId != 0">
+			AND d.role_id  = #{roleId}
+		</if>
+		AND a.menu_type = 'F'
+		GROUP BY
+		a.menu_id
+		order by a.parent_id, a.order_num
+	</select>
+
 	<select id="getButtonlistOne"  resultType="com.bizmatics.model.system.SysMenu" >
 		SELECT
 			*

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

@@ -301,7 +301,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             sysMenuListFour = menuMapper.getSysMenuList("F");
         }else {
             //已选中按钮列表
-            sysMenuListFour = menuMapper.getButtonlist(0L, null, roleId);
+            sysMenuListFour = menuMapper.getButtonlistTwo(0L, null, roleId);
         }
 
         List<SysMenuTwoVo> sysMenuVoListOne = new ArrayList<>();