fix

Helius

2022-08-30 d39169d41038ed62d1f6a9b25513b247a1a8c02f

 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)){