fix(DEFECT-405): 租户角色禁用后，菜单访问控制问题

@@ -41,8 +41,13 @@
         SELECT
         <include refid="menuDTOMapColumn">
         </include>
-        FROM sys_menu
-        WHERE id IN (SELECT menu_id FROM sys_tenant_menu WHERE tenant_id = #{tenantId})
+        FROM sys_menu WHERE id IN (
+            SELECT menu_id FROM sys_role_menu WHERE role_id IN (
+                SELECT id FROM sys_role WHERE id in (
+                    SELECT role_id FROM sys_tenant_role WHERE tenant_id = #{tenantId}
+                ) AND enabled=true
+            )
+        )
     </select>
 
     <select id="selectMyMenu" resultMap="menuDTOMap">
@@ -50,10 +55,13 @@
         <include refid="menuDTOMapColumn">
         </include>
         FROM sys_menu
-        WHERE id IN (SELECT menu_id
-        FROM sys_role_menu
-        WHERE role_id IN (SELECT id FROM sys_role WHERE id in (SELECT role_id FROM sys_user_role WHERE user_id
-        = #{userId}) AND enabled=true))
+        WHERE id IN (
+            SELECT menu_id FROM sys_role_menu WHERE role_id IN (
+                SELECT id FROM sys_role WHERE id in (
+                    SELECT role_id FROM sys_user_role WHERE user_id = #{userId}
+                ) AND enabled=true
+            )
+        )
     </select>
 
     <delete id="deleteTenantMenuMappingByMenuIds">