From 333a38978e9f46b0768e7c19ea3e870bb0cf8508 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 三月 2022 13:29:04 +0800
Subject: [PATCH] update 重命名 菜单字段 query -> query_param 解决系统关键字问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 2 +-
script/sql/ry_vue_4.X.sql | 2 +-
ruoyi-ui/src/views/system/menu/index.vue | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 4 ++--
ruoyi-admin/src/main/resources/application.yml | 2 --
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 6 +++---
6 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b445974..b46caab 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -194,8 +194,6 @@
updateStrategy: NOT_NULL
# 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢
where-strategy: NOT_NULL
- # 瀵� mysql 鐨勫瓧娈靛仛鏍煎紡鍖� 闃叉鍑虹幇绯荤粺鍏抽敭瀛�
- column-format: "`%s`"
# Swagger閰嶇疆
swagger:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index a44e749..00db941 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -65,7 +65,7 @@
* 璺敱鍙傛暟
*/
@ApiModelProperty(value = "璺敱鍙傛暟")
- private String query;
+ private String queryParam;
/**
* 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index 8d1613f..47aed2c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -141,7 +141,7 @@
router.setName(getRouteName(menu));
router.setPath(getRouterPath(menu));
router.setComponent(getComponent(menu));
- router.setQuery(menu.getQuery());
+ router.setQuery(menu.getQueryParam());
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
List<SysMenu> cMenus = (List<SysMenu>) menu.getChildren();
if (!cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
@@ -156,7 +156,7 @@
children.setComponent(menu.getComponent());
children.setName(StringUtils.capitalize(menu.getPath()));
children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
- children.setQuery(menu.getQuery());
+ children.setQuery(menu.getQueryParam());
childrenList.add(children);
router.setChildren(childrenList);
} else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index b219b95..df17efd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -12,7 +12,7 @@
<result property="orderNum" column="order_num"/>
<result property="path" column="path"/>
<result property="component" column="component"/>
- <result property="query" column="query"/>
+ <result property="queryParam" column="query_param"/>
<result property="isFrame" column="is_frame"/>
<result property="isCache" column="is_cache"/>
<result property="menuType" column="menu_type"/>
@@ -28,7 +28,7 @@
</resultMap>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
- select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status,
+ select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query_param, m.visible, m.status,
m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -43,7 +43,7 @@
m.menu_name,
m.path,
m.component,
- m.query,
+ m.query_param,
m.visible,
m.status,
m.perms,
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 1b6f39d..4290527 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -208,7 +208,7 @@
</el-col>
<el-col :span="12" v-if="form.menuType == 'C'">
<el-form-item>
- <el-input v-model="form.query" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
+ <el-input v-model="form.queryParam" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
<span slot="label">
<el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top">
<i class="el-icon-question"></i>
diff --git a/script/sql/ry_vue_4.0.sql b/script/sql/ry_vue_4.X.sql
similarity index 99%
rename from script/sql/ry_vue_4.0.sql
rename to script/sql/ry_vue_4.X.sql
index 1fe490e..47f5da6 100644
--- a/script/sql/ry_vue_4.0.sql
+++ b/script/sql/ry_vue_4.X.sql
@@ -137,7 +137,7 @@
order_num int(4) default 0 comment '鏄剧ず椤哄簭',
path varchar(200) default '' comment '璺敱鍦板潃',
component varchar(255) default null comment '缁勪欢璺緞',
- query varchar(255) default null comment '璺敱鍙傛暟',
+ query_param varchar(255) default null comment '璺敱鍙傛暟',
is_frame int(1) default 1 comment '鏄惁涓哄閾撅紙0鏄� 1鍚︼級',
is_cache int(1) default 0 comment '鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級',
menu_type char(1) default '' comment '鑿滃崟绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�',
--
Gitblit v1.9.3