From 72e4c1f558c3a0ae7a3730a3b80da11f3e7729a7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jul 2022 18:00:53 +0800
Subject: [PATCH] fix template upload
---
src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
index 0ec80b8..50ef367 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
@@ -37,9 +37,12 @@
ColumnEntity columnEntity = columnMapper.selectByCodeAndCompanyId(param.getCode(), companyId);
+ if (columnEntity == null) {
+ return;
+ }
ColumnData columnData = columnToData(columnEntity);
if (columnEntity.getParentId() == 0L) {
- List<ColumnEntity> child = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId);
+ List<ColumnEntity> child = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId, 1);
if (CollUtil.isNotEmpty(child)) {
List<ColumnData> list = new ArrayList<>();
for (ColumnEntity entity : child) {
--
Gitblit v1.9.1