From 9b02eab3cb3fc2b487e6a3de3992aa3b7d284d40 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 14:54:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java | 3 +++
1 files changed, 3 insertions(+), 0 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..99705b7 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,6 +37,9 @@
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);
--
Gitblit v1.9.1