farmer-cms.git - Gitblit

			@@ -182,7 +182,7 @@
			return Result.fail("请选择文章栏目");
			}

			if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == null) {
			if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == -1) {
			articleEntity.setBeforeColumnId(articleEntity.getColumnId());
			}
			articleEntity.setColumnId(columnId);
			@@ -207,7 +207,6 @@
			articleEntity.setArticleUrl(adminUpdateArticleDto.getArticleUrl());
			articleEntity.setType(adminUpdateArticleDto.getType());
			articleEntity.setContentType(adminUpdateArticleDto.getContentType());
			articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);

			String authorBelong = adminUpdateArticleDto.getAuthorBelong();
			articleEntity.setAuthorBelong(authorBelong);
			@@ -239,6 +238,8 @@
			}
			articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_NO);
			this.baseMapper.updateById(articleEntity);

			releaseService.releaseColumn(articleEntity.getColumnId(), 2, articleEntity.getCompanyId());
			return Result.ok("操作成功");
			}

			@@ -291,6 +292,15 @@
			articleEntity.setTimeType(timeType);
			}
			IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);

			if (CollUtil.isNotEmpty(list.getRecords())) {
			for (WebArticleVo record : list.getRecords()) {
			// 站内
			if (record.getType() == 1) {
			record.setArticleUrl(record.getBaseUrl() + record.getPath() + "/" + record.getId() + ".html");
			}
			}
			}
			return Result.ok(list);
			}

			@@ -302,7 +312,6 @@
			return Result.fail("文章不存在");
			}
			articleEntity.setReleaseStatus(ArticleEntity.RELEASE_STATUS_YES);
			articleEntity.setBeforeColumnId(null);
			this.baseMapper.updateById(articleEntity);

			releaseService.releaseArticle(articleEntity.getId(), companyId);