From 067a97bbdb615cc8795e161788a356d3f4ec756d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Aug 2022 11:59:25 +0800
Subject: [PATCH] fix
---
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