2025-07-31 基础数据调整

src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java

@@ -70,16 +70,8 @@ public class SysMenuController extends AbstractController {
     @GetMapping("/list/{language}")
     @RequiresPermissions("sys:menu:list")
     public List<SysMenuEntity> listLanguage(@PathVariable String language) {
-        List<SysMenuEntity> menuList = sysMenuService.listLanguage(language);
-        ;
-        for (SysMenuEntity sysMenuEntity : menuList) {
-            System.out.println(sysMenuEntity.getParentId());
-            SysMenuEntity parentMenuEntity = sysMenuService.getByIdLanguage(sysMenuEntity.getParentId(), language);
-            if (parentMenuEntity != null) {
-                sysMenuEntity.setParentName(parentMenuEntity.getName());
-            }
-        }
-
+        // 使用优化后的查询方法，一次性获取菜单和父菜单信息
+        List<SysMenuEntity> menuList = sysMenuService.listLanguageWithParent(language);
         return menuList;
     }
 
@@ -91,7 +83,6 @@ public class SysMenuController extends AbstractController {
     public R select() {
         //查询列表数据
         List<SysMenuEntity> menuList = sysMenuService.queryNotButtonList();
-
         //添加顶级菜单
         SysMenuEntity root = new SysMenuEntity();
         root.setMenuId("0");
@@ -99,7 +90,6 @@ public class SysMenuController extends AbstractController {
         root.setParentId("-1");
         root.setOpen(true);
         menuList.add(root);
-
         return R.ok().put("menuList", menuList);
     }
 

src/main/java/com/gaotao/modules/sys/dao/SysMenuDao.java

@@ -42,6 +42,11 @@ public interface SysMenuDao extends BaseMapper<SysMenuEntity> {
 	 */
 	List<SysMenuEntity> listLanguage(String language);
 
+	/**
+	 * 根据语言获取菜单列表（包含父菜单名称）
+	 */
+	List<SysMenuEntity> listLanguageWithParent(String language);
+
 	/**
 	 * 更具id获取多语言菜单
 	 * @param sysObjectLanguageMenu

src/main/java/com/gaotao/modules/sys/service/SysMenuService.java

@@ -54,6 +54,8 @@ public interface SysMenuService extends IService<SysMenuEntity> {
 
 	List<SysMenuEntity> listLanguage(String language);
 
+	List<SysMenuEntity> listLanguageWithParent(String language);
+
 	SysMenuEntity getByIdLanguage(String parentId, String language);
 
     List<SysObjectLanguageMenu> searchMenuLanguageById(SysObjectLanguageMenu sysObjectLanguageMenu);

src/main/java/com/gaotao/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -131,6 +131,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
 		return list;
 	}
 
+	@Override
+	public List<SysMenuEntity> listLanguageWithParent(String language) {
+		List<SysMenuEntity> list = sysMenuDao.listLanguageWithParent(language);
+		return list;
+	}
+
 	@Override
 	public SysMenuEntity getByIdLanguage(String parentId, String language) {
 		SysMenuEntity sysMenuEntity = sysMenuDao.getByIdLanguage(parentId,language);

src/main/resources/mapper/sys/SysMenuDao.xml

@@ -68,6 +68,29 @@
                            ON (sm.menu_id = sml.menu_id and sml.language_code = #{language})
         ORDER BY sm.order_num
     </select>
+    
+    <select id="listLanguageWithParent" resultType="com.gaotao.modules.sys.entity.SysMenuEntity">
+        SELECT 
+            sm.menu_id,
+            sm.parent_id,
+            ISNULL(sml.language_value, sm.name) as name,
+            sm.url,
+            sm.perms,
+            sm.type,
+            sm.icon,
+            sm.order_num,
+            sm.menu_type,
+            ISNULL(pml.language_value, pm.name) as parentName
+        FROM sys_menu sm
+        LEFT JOIN sys_object_language_menu sml
+            ON (sm.menu_id = sml.menu_id and sml.language_code = #{language})
+        LEFT JOIN sys_menu pm
+            ON (sm.parent_id = pm.menu_id)
+        LEFT JOIN sys_object_language_menu pml
+            ON (pm.menu_id = pml.menu_id and pml.language_code = #{language})
+        ORDER BY sm.order_num
+    </select>
+    
     <select id="searchMenuLanguageById" resultType="com.gaotao.modules.sys.entity.SysObjectLanguageMenu">
         SELECT
         sm.menu_id,