From 2cdc12055d597c7c25e2e83b24ebf32053f18757 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 16 六月 2021 13:15:18 +0800
Subject: [PATCH] fix 修复 JsonUtils 参数为空报错
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 5b4bff8..76073c7 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
@@ -319,7 +319,7 @@
*/
public static String getTreecode(Map<String, Object> paramsObj)
{
- if (paramsObj.containsKey(GenConstants.TREE_CODE))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE))
{
return StrUtil.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)));
}
@@ -334,7 +334,7 @@
*/
public static String getTreeParentCode(Map<String, Object> paramsObj)
{
- if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
{
return StrUtil.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)));
}
@@ -349,7 +349,7 @@
*/
public static String getTreeName(Map<String, Object> paramsObj)
{
- if (paramsObj.containsKey(GenConstants.TREE_NAME))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME))
{
return StrUtil.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)));
}
@@ -365,8 +365,8 @@
public static int getExpandColumn(GenTable genTable)
{
String options = genTable.getOptions();
- Map<String, String> paramsObj = JsonUtils.parseMap(options);
- String treeName = paramsObj.get(GenConstants.TREE_NAME);
+ Map<String, Object> paramsObj = JsonUtils.parseMap(options);
+ String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
int num = 0;
for (GenTableColumn column : genTable.getColumns())
{
--
Gitblit v1.9.3