BUg修复

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

@@ -85,6 +85,8 @@ public interface SysMenuMapper {
 
     public List<SysMenu> getSysMenuList(String menuType);
 
+    public List<SysMenu> getSysMenuListThree(String menuType,Integer tenantId);
+
     /**
      * 根据角色ID查询菜单树信息
      *

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

@@ -224,6 +224,26 @@
 		order_num
 	</select>
 
+	<select id="getSysMenuListThree"  resultType="com.bizmatics.model.system.SysMenu" >
+		SELECT
+		m.*
+		FROM
+		sys_menu AS m
+		JOIN sys_platform_menu AS p ON m.menu_id = p.menu_id
+		JOIN sys_tenant AS t ON p.platform_id = t.system_name
+		WHERE
+		m. STATUS = 0
+		AND t.id = #{tenantId}
+		<if test="menuType != null and menuType != ''">
+			AND m.menu_type = #{menuType}
+		</if>
+		GROUP BY
+		m.menu_id
+		ORDER BY
+		m.parent_id,
+		m.order_num
+	</select>
+
 
 	<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

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

@@ -677,11 +677,11 @@ public class SysMenuServiceImpl implements ISysMenuService {
         List<SysMenu> sysMenuListThree = new ArrayList<>();
         if (tenantDaya.get(0).getUserType().equals("01")) {
             //全部目录查询
-            sysMenuListTwo = menuMapper.getSysMenuList("M");
+            sysMenuListTwo = menuMapper.getSysMenuListThree("M",tenantDaya.get(0).getTenantId());
             //全部菜单查询
-            sysMenuListOne = menuMapper.getSysMenuList("C");
+            sysMenuListOne = menuMapper.getSysMenuListThree("C",tenantDaya.get(0).getTenantId());
             //全部按钮列表
-            sysMenuListThree = menuMapper.getSysMenuList("F");
+            sysMenuListThree = menuMapper.getSysMenuListThree("F",tenantDaya.get(0).getTenantId());
         } else {
             //全部目录查询
             sysMenuListTwo = sysMenuListTwo = menuMapper.getMenuListTwo(loginUser.getUser().getUserId(), "M",tenantDaya.get(0).getTenantId());