From aca3b4a5cacc948a21f654592c5b2fce53677a0c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 Aug 2022 15:27:32 +0800
Subject: [PATCH] 20220809 最大上传512

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
index 7e9986d..0b74d4a 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
@@ -175,8 +175,10 @@
                 adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + columnEntity.getPath() + "/" + columnEntity.getTargetUrl() + ".html");
             } else if (columnEntity.getTargetType() == 2) {
                 ColumnEntity column = this.baseMapper.selectByCodeAndCompanyId(columnEntity.getTargetUrl(), LoginUserUtil.getCompanyId());
-                adminSeeColumnInfoVo.setTargetName(column.getColumnName());
-                adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + column.getPath());
+                if (column == null) {
+                    adminSeeColumnInfoVo.setTargetName(column.getColumnName());
+                    adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + column.getPath());
+                }
             }
         } else {
             adminSeeColumnInfoVo.setUrl(companyEntity.getWebAddress() + columnEntity.getPath());

--
Gitblit v1.9.1