From d3a821c26d23d707b0996532a5a715d3faed74b8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 22 二月 2022 19:05:46 +0800
Subject: [PATCH] 优化菜单关键字导致的插件报错问题

---
 src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
index 6195690..751e53b 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
@@ -30,7 +30,7 @@
 
     /**
      * 璁剧疆妯℃澘鍙橀噺淇℃伅
-     * 
+     *
      * @return 妯℃澘鍒楄〃
      */
     public static VelocityContext prepareContext(GenTable genTable)
@@ -119,9 +119,10 @@
         context.put("subclassName", StringUtils.uncapitalize(subClassName));
         context.put("subImportList", getImportList(genTable.getSubTable()));
     }
+
     /**
      * 鑾峰彇妯℃澘淇℃伅
-     * 
+     *
      * @return 妯℃澘鍒楄〃
      */
     public static List<String> getTemplateList(String tplCategory)
@@ -220,15 +221,14 @@
 
     /**
      * 鑾峰彇鍖呭墠缂�
-     * 
+     *
      * @param packageName 鍖呭悕绉�
      * @return 鍖呭墠缂�鍚嶇О
      */
     public static String getPackagePrefix(String packageName)
     {
         int lastIndex = packageName.lastIndexOf(".");
-        String basePackage = StringUtils.substring(packageName, 0, lastIndex);
-        return basePackage;
+        return StringUtils.substring(packageName, 0, lastIndex);
     }
 
     /**
@@ -285,7 +285,7 @@
 
     /**
      * 鑾峰彇鏉冮檺鍓嶇紑
-     * 
+     *
      * @param moduleName 妯″潡鍚嶇О
      * @param businessName 涓氬姟鍚嶇О
      * @return 杩斿洖鏉冮檺鍓嶇紑
@@ -297,8 +297,8 @@
 
     /**
      * 鑾峰彇涓婄骇鑿滃崟ID瀛楁
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 涓婄骇鑿滃崟ID瀛楁
      */
     public static String getParentMenuId(JSONObject paramsObj)
@@ -313,8 +313,8 @@
 
     /**
      * 鑾峰彇鏍戠紪鐮�
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠紪鐮�
      */
     public static String getTreecode(JSONObject paramsObj)
@@ -328,8 +328,8 @@
 
     /**
      * 鑾峰彇鏍戠埗缂栫爜
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠埗缂栫爜
      */
     public static String getTreeParentCode(JSONObject paramsObj)
@@ -343,8 +343,8 @@
 
     /**
      * 鑾峰彇鏍戝悕绉�
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戝悕绉�
      */
     public static String getTreeName(JSONObject paramsObj)
@@ -358,7 +358,7 @@
 
     /**
      * 鑾峰彇闇�瑕佸湪鍝竴鍒椾笂闈㈡樉绀哄睍寮�鎸夐挳
-     * 
+     *
      * @param genTable 涓氬姟琛ㄥ璞�
      * @return 灞曞紑鎸夐挳鍒楀簭鍙�
      */
@@ -382,4 +382,4 @@
         }
         return num;
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3