用户菜单修改

bsoft-admin/src/main/java/com/bsoft/admin/mapper/SysMenuMapper.java

@@ -17,7 +17,9 @@ public interface SysMenuMapper {
 
     int updateByPrimaryKey(SysMenu record);
 
-    List<SysMenuList> selectMenuByUser(Long userId);
+    List<SysMenuList> selectMenuAllByUser(Long userId);
+
+    List<SysMenuList> selectMenuByRole(Long userId);
 
     List<SysMenuList> selectParentAll();
 

bsoft-admin/src/main/resources/mapper/SysMenuMapper.xml

@@ -62,8 +62,16 @@
     from SYS_MENU
     where "STATE"=1
   </select>
-  <select id="selectMenuByUser" resultMap="sysMenuResultMap">
-        select DISTINCT m.ID,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID,m.PAGE_CODE,m.SORT
+  <select id="selectMenuAllByUser" resultMap="sysMenuResultMap">
+        select DISTINCT m.ID,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID,m.PAGE_CODE,m.SORT,umr.STATE
+        from
+        SYS_USER_MENU_RS umr
+        LEFT JOIN
+        SYS_MENU m on umr.MENU_ID = m.ID
+        where m.STATE=1  and  umr.USER_ID = #{userId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectMenuByRole" resultMap="sysMenuResultMap">
+        select DISTINCT m.ID,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID,m.PAGE_CODE,m.SORT,rmr.STATE
         from
         SYS_ROLE_MENU_RS rmr
         LEFT JOIN
@@ -71,18 +79,9 @@
         LEFT JOIN
         SYS_USER_ROLE_RS urr on rmr.ROLE_ID = urr.Role_ID
         where rmr.STATE=1 and m.STATE=1 and urr.STATE=1 and  urr.USER_ID = #{userId,jdbcType=DECIMAL}
-
-        union
-
-        select DISTINCT m.ID,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID,m.PAGE_CODE,m.SORT
-        from
-        SYS_USER_MENU_RS umr
-        LEFT JOIN
-        SYS_MENU m on umr.MENU_ID = m.ID
-        where umr.STATE=1 and m.STATE=1  and  umr.USER_ID = #{userId,jdbcType=DECIMAL}
   </select>
   <select id="selectMaxSort" resultType="java.lang.Integer">
-      select  nvl( MAX(SORT),0) AS SORT
+      select  nvl(MAX(SORT),0) AS SORT
       from SYS_MENU
       where PARENT_ID=#{parentId,jdbcType=DECIMAL}
   </select>