From 62a304eb5c68fc7f54a9bc247e76223cc2c7f243 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 14 Dec 2022 11:05:30 +0800 Subject: [PATCH] fix --- src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 7 +++++-- 1 files changed, 5 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..16669b5 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()); @@ -251,6 +253,7 @@ QueryWrapper<ColumnEntity> objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("parent_id",id); objectQueryWrapper.eq("company_id",companyId); + objectQueryWrapper.orderByAsc("order_num"); List<ColumnEntity> columnEntities = this.baseMapper.selectList(objectQueryWrapper); List<AdminColumnVo> adminColumnVoChilds = new ArrayList<>(); if(CollUtil.isNotEmpty(columnEntities)){ -- Gitblit v1.9.1