From cfa86bd4fe96561a143a37ace8c85b7bd22d0f83 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Fri, 03 Sep 2021 09:39:40 +0800
Subject: [PATCH] !308 代码生成: 导入表时查询 新创建表的优先排序在前面 Merge pull request !308 from xiaoshitou/N/A
---
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