首页

2025-11-06 15:33:35 +08:00
parent 2f9a27d2a0
commit 6efa654957
8 changed files with 456 additions and 474 deletions
@@ -67,10 +67,11 @@ public class SysV4AppsController {
        Sql sql = Sqls.create("""
                SELECT
                  m.id,
-                  m.name,
+                  m.`name`,
                  m.href,
                  m.icon,
                  m.picIcon,
+                  sm.`name` AS moduleName,
                CASE
                    WHEN f.userId IS NOT NULL THEN
                    1 ELSE 0
@@ -79,6 +80,7 @@ public class SysV4AppsController {
                  sys_menu m
                  LEFT JOIN sys_user_favorite_app f ON m.id = f.appId
                  AND f.userId = @userId
+                  LEFT JOIN sys_module sm ON sm.id = m.moduleId
                $condition
                """);
        Cnd cnd = Cnd.NEW();
@@ -138,10 +140,11 @@ public class SysV4AppsController {
        Sql sql = Sqls.create("""
                SELECT
                  m.id,
-                  m.name,
+                  m.`name`,
                  m.href,
                  m.icon,
                  m.picIcon,
+                  sm.`name` AS moduleName,
                  1 AS isFavorite
                FROM
                  sys_user_favorite_app f
@@ -149,6 +152,7 @@ public class SysV4AppsController {
                  sys_menu m
                ON
                  f.appId = m.id
+                LEFT JOIN sys_module sm ON sm.id = m.moduleId
                WHERE
                  f.userId = @userId
                  AND m.platform = 'PC'