From c81d96a6d4ea561754078043a4073b213c75b8f1 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 27 Feb 2023 10:35:35 +0800
Subject: [PATCH] =?UTF-8?q?CmsUtils.getArticleList=20=E7=9A=84=20isQueryAr?=
 =?UTF-8?q?ticleData=20=E5=8F=82=E6=95=B0=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#I6HN74?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/modules/cms/entity/Article.java   | 45 +++++++++----------
 .../modules/cms/service/ArticleService.java   |  2 +-
 .../mappings/modules/cms/ArticleDao.xml       | 14 ++++--
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java
index 0bc6bc06..5c002976 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java
@@ -4,13 +4,6 @@
  */
 package com.jeesite.modules.cms.entity;
 
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import javax.validation.constraints.Size;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeesite.common.entity.BaseEntity;
 import com.jeesite.common.entity.DataEntity;
@@ -20,6 +13,11 @@ import com.jeesite.common.mybatis.annotation.Table;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.modules.cms.utils.CmsUtils;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
 /**
  * 文章表Entity
  * @author 长春叭哥、ThinkGem
@@ -83,12 +81,13 @@ public class Article extends DataEntity<Article> {
 	private Integer wordCount; 			// 字数（不包含html）
 	private String customContentView; 	// 自定义内容视图
 	private String viewConfig; 			// 视图配置
+
 	private ArticleData articleData; 	//文章副表
+	private Boolean isQueryArticleData; // 是否查询文章内容
+
 	private Date beginDate; 			// 开始时间
 	private Date endDate; 				// 结束时间
 
-	private Boolean isQueryArticleData; // 是否查询文章内容
-
 	public Article() {
 		super();
 		//this.weight = 0;
@@ -223,8 +222,6 @@ public class Article extends DataEntity<Article> {
 		this.hits = hits;
 	}
 
-	
-
 	public Integer getHitsPlus() {
 		return hitsPlus;
 	}
@@ -275,6 +272,18 @@ public class Article extends DataEntity<Article> {
 		this.articleData = articleData;
 	}
 
+	/**
+	 * 是否查询文章内容
+	 * @return
+	 */
+	public Boolean getIsQueryArticleData() {
+		return isQueryArticleData;
+	}
+
+	public void setIsQueryArticleData(Boolean isQueryArticleData) {
+		this.isQueryArticleData = isQueryArticleData;
+	}
+
 	public Date getBeginDate() {
 		return beginDate;
 	}
@@ -291,20 +300,6 @@ public class Article extends DataEntity<Article> {
 		this.endDate = endDate;
 	}
 
-	/**
-	 * 是否查询文章内容
-	 * @return
-	 */
-	public Boolean getIsQueryArticleData() {
-		return isQueryArticleData;
-	}
-
-	public void setIsQueryArticleData(Boolean isQueryArticleData) {
-		this.isQueryArticleData = isQueryArticleData;
-	}
-
-	 
-
 	public String getUrl() {
 		return CmsUtils.getUrlDynamic(this);
 	}
diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java
index 53e98dc2..989743b1 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/ArticleService.java
@@ -79,7 +79,7 @@ public class ArticleService extends CrudService<ArticleDao, Article> {
 	/**
 	 * 查询分页数据
 	 * @param article 查询条件
-	 * @param article.page 分页对象
+	 * @param article page 分页对象
 	 * @return
 	 */
 	@Override
diff --git a/modules/cms/src/main/resources/mappings/modules/cms/ArticleDao.xml b/modules/cms/src/main/resources/mappings/modules/cms/ArticleDao.xml
index 1c2c1821..5630e137 100644
--- a/modules/cms/src/main/resources/mappings/modules/cms/ArticleDao.xml
+++ b/modules/cms/src/main/resources/mappings/modules/cms/ArticleDao.xml
@@ -2,15 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jeesite.modules.cms.dao.ArticleDao">
 	
-	<!-- 查询数据
-	<select id="findList" resultType="CmsArticle">
+	<!-- 查询数据 -->
+	<select id="findList" resultType="Article">
 		SELECT ${sqlMap.column.toSql()}
+			<if test="isQueryArticleData">,
+				ad.content AS "articleData.content",
+				ad.relation AS "articleData.relation",
+				ad.is_can_comment AS "articleData.isCanComment"
+			</if>
 		FROM ${sqlMap.table.toSql()}
+		<if test="isQueryArticleData">
+			JOIN ${_prefix}cms_article_data ad ON ad.id = a.id
+		</if>
 		<where>
 			${sqlMap.where.toSql()}
 		</where>
 		ORDER BY ${sqlMap.order.toSql()}
-	</select> -->
+	</select>
 	
 	<update id="updateExpiredWeight">
 		update ${_prefix}cms_article SET weight = 0