Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-05 cee43c11fe6772305e19e7ddee1e8276060046d6

 src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java

@@ -25,7 +25,7 @@

    private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
    private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
    private String BASE_URL = "http://192.168.0.1/";
    private String BASE_URL = "http://192.168.0.1";

    @Override
    public void dataParser(AttrNode attrNode) {
@@ -55,13 +55,14 @@
    public ColumnData columnToData(ColumnEntity column) {
        ColumnData columnData = ColumnConversion.INSTANCE.entityToData(column);

        columnData.setUrl(BASE_URL + columnData.getCode());
        columnData.setUrl(BASE_URL + column.getPath());
        if (column.getType() == 2) {
            if (column.getTargetType() == 1) {
                ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
                columnData.setUrl(BASE_URL + article.getColumnCode() + "/" + article.getId() + ".html");
                columnData.setUrl(BASE_URL + article.getPath() + "/" + article.getId() + ".html");
            } else if (column.getTargetType() == 2) {
                columnData.setUrl(BASE_URL + column.getTargetUrl());
                ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
                columnData.setUrl(BASE_URL + columnEntity.getPath());
            } else {
                columnData.setUrl(column.getTargetUrl());
            }