From 779508989ff3461e90f2dd04b11d37596c5efa18 Mon Sep 17 00:00:00 2001
From: mroldx <974751082@qq.com>
Date: 星期四, 12 八月 2021 17:30:31 +0800
Subject: [PATCH] 添加加载字典数据,清空字典数据,重置字典数据方法上遗漏的@Override注解

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 a674313..6481057 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
@@ -280,7 +280,8 @@
      */
     public static String getParentMenuId(JSONObject paramsObj)
     {
-        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+                && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
         {
             return paramsObj.getString(GenConstants.PARENT_MENU_ID);
         }

--
Gitblit v1.9.2