diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index aa01c20..30a7c8c 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -239,6 +239,7 @@ public class GenTableServiceImpl implements IGenTableService { genContext.prop2path.put("ClassName", table.getClassName()); genContext.prop2path.put("className", StrUtil.lowerFirst(table.getClassName())); genContext.prop2path.put("tableName", table.getTableName()); + genContext.prop2path.put("moduleName", table.getModuleName()); // 初始化模板 VelocityInitializer.initVelocity(); diff --git a/ruoyi-generator/src/test/resources/vm2/sql/sql.vm b/ruoyi-generator/src/test/resources/vm2/sql/sql.vm index 1e10188..60f8d3e 100644 --- a/ruoyi-generator/src/test/resources/vm2/sql/sql.vm +++ b/ruoyi-generator/src/test/resources/vm2/sql/sql.vm @@ -1,6 +1,6 @@ -- 菜单 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${className}', '${moduleName}/${className}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), '', null, '${functionName}菜单'); +values('${functionName}', '${parentMenuId}', '1', '${className}', '${rootPermission}/${moduleName}/${className}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), '', null, '${functionName}菜单'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); diff --git a/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm b/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm index ed96c69..222c280 100644 --- a/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm +++ b/ruoyi-generator/src/test/resources/vm2/vue/index.vue.vm @@ -143,7 +143,7 @@ - + #set($count0 = 0) #foreach($column in $columns) @@ -199,7 +199,7 @@ >删除 - +