From 9b9c1b999fe0b1e21c038a1d5227609071fd7aa4 Mon Sep 17 00:00:00 2001
From: yuhong0206@sina.cn <yuhong0206@sina.cn>
Date: 星期一, 29 三月 2021 09:00:44 +0800
Subject: [PATCH] 读取excel增加 if(row == null) { continue; } 判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
---
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 9de4d44..21b1cc5 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -63,10 +63,12 @@
public AjaxResult getInfo(@PathVariable Long talbleId)
{
GenTable table = genTableService.selectGenTableById(talbleId);
+ List<GenTable> tables = genTableService.selectGenTableAll();
List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
Map<String, Object> map = new HashMap<String, Object>();
map.put("info", table);
map.put("rows", list);
+ map.put("tables", tables);
return AjaxResult.success(map);
}
--
Gitblit v1.9.2