From 55095a50b5df8b6207bc92fbcbc065c2bcd4ba7d Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期四, 23 七月 2020 21:25:02 +0800
Subject: [PATCH] !48 ExcelUtil 功能优化 Merge pull request !48 from soulCoke/master

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 8d17da0..b061ee8 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -24,7 +24,7 @@
 
     /**
      * 璁剧疆妯℃澘鍙橀噺淇℃伅
-     * 
+     *
      * @return 妯℃澘鍒楄〃
      */
     public static VelocityContext prepareContext(GenTable genTable)
@@ -93,7 +93,7 @@
 
     /**
      * 鑾峰彇妯℃澘淇℃伅
-     * 
+     *
      * @return 妯℃澘鍒楄〃
      */
     public static List<String> getTemplateList(String tplCategory)
@@ -183,7 +183,7 @@
 
     /**
      * 鑾峰彇鍖呭墠缂�
-     * 
+     *
      * @param packageName 鍖呭悕绉�
      * @return 鍖呭墠缂�鍚嶇О
      */
@@ -196,8 +196,8 @@
 
     /**
      * 鏍规嵁鍒楃被鍨嬭幏鍙栧鍏ュ寘
-     * 
-     * @param column 鍒楅泦鍚�
+     *
+     * @param columns 鍒楅泦鍚�
      * @return 杩斿洖闇�瑕佸鍏ョ殑鍖呭垪琛�
      */
     public static HashSet<String> getImportList(List<GenTableColumn> columns)
@@ -220,7 +220,7 @@
 
     /**
      * 鑾峰彇鏉冮檺鍓嶇紑
-     * 
+     *
      * @param moduleName 妯″潡鍚嶇О
      * @param businessName 涓氬姟鍚嶇О
      * @return 杩斿洖鏉冮檺鍓嶇紑
@@ -233,13 +233,13 @@
 
     /**
      * 鑾峰彇涓婄骇鑿滃崟ID瀛楁
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 涓婄骇鑿滃崟ID瀛楁
      */
     public static String getParentMenuId(JSONObject paramsObj)
     {
-        if (paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
         {
             return paramsObj.getString(GenConstants.PARENT_MENU_ID);
         }
@@ -248,8 +248,8 @@
 
     /**
      * 鑾峰彇鏍戠紪鐮�
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠紪鐮�
      */
     public static String getTreecode(JSONObject paramsObj)
@@ -263,8 +263,8 @@
 
     /**
      * 鑾峰彇鏍戠埗缂栫爜
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠埗缂栫爜
      */
     public static String getTreeParentCode(JSONObject paramsObj)
@@ -278,8 +278,8 @@
 
     /**
      * 鑾峰彇鏍戝悕绉�
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戝悕绉�
      */
     public static String getTreeName(JSONObject paramsObj)
@@ -293,7 +293,7 @@
 
     /**
      * 鑾峰彇闇�瑕佸湪鍝竴鍒椾笂闈㈡樉绀哄睍寮�鎸夐挳
-     * 
+     *
      * @param genTable 涓氬姟琛ㄥ璞�
      * @return 灞曞紑鎸夐挳鍒楀簭鍙�
      */
@@ -317,4 +317,4 @@
         }
         return num;
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3