From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期
---
src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
index 379323c..fad86e5 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
@@ -188,7 +188,7 @@
RouterVo children = new RouterVo();
children.setPath(menu.getPath());
children.setComponent(menu.getComponent());
- children.setName(StringUtils.capitalize(menu.getPath()));
+ children.setName(getRouteName(menu.getRouteName(), menu.getPath()));
children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
children.setQuery(menu.getQuery());
childrenList.add(children);
@@ -203,7 +203,7 @@
String routerPath = innerLinkReplaceEach(menu.getPath());
children.setPath(routerPath);
children.setComponent(UserConstants.INNER_LINK);
- children.setName(StringUtils.capitalize(routerPath));
+ children.setName(getRouteName(menu.getRouteName(), routerPath));
children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
childrenList.add(children);
router.setChildren(childrenList);
@@ -354,13 +354,25 @@
*/
public String getRouteName(SysMenu menu)
{
- String routerName = StringUtils.capitalize(menu.getPath());
// 闈炲閾惧苟涓旀槸涓�绾х洰褰曪紙绫诲瀷涓虹洰褰曪級
if (isMenuFrame(menu))
{
- routerName = StringUtils.EMPTY;
+ return StringUtils.EMPTY;
}
- return routerName;
+ return getRouteName(menu.getRouteName(), menu.getPath());
+ }
+
+ /**
+ * 鑾峰彇璺敱鍚嶇О锛屽娌℃湁閰嶇疆璺敱鍚嶇О鍒欏彇璺敱鍦板潃
+ *
+ * @param name 璺敱鍚嶇О
+ * @param path 璺敱鍦板潃
+ * @return 璺敱鍚嶇О锛堥┘宄版牸寮忥級
+ */
+ public String getRouteName(String name, String path)
+ {
+ String routerName = StringUtils.isNotEmpty(name) ? name : path;
+ return StringUtils.capitalize(routerName);
}
/**
@@ -426,7 +438,7 @@
return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
&& menu.getIsFrame().equals(UserConstants.NO_FRAME);
}
-
+
/**
* 鏄惁涓簆arent_view缁勪欢
*
--
Gitblit v1.9.3