From 57b159eb98577f910e586f3cf79356274d68db0f Mon Sep 17 00:00:00 2001
From: wangzhaoqiang <tjwangzhaoqiang@163.com>
Date: 星期一, 16 八月 2021 14:48:34 +0800
Subject: [PATCH] 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接
---
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