From 530598f0c672e9df8a46e4d69fb79852424fdbc3 Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Sat, 4 Jan 2020 11:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=A0=E6=B3=95=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../net/mingsoft/cms/util/CmsParserUtil.java  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
index 608ed55c..2a7d7e92 100644
--- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
+++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
@@ -1,13 +1,5 @@
 package net.mingsoft.cms.util;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.PageUtil;
 import freemarker.cache.FileTemplateLoader;
@@ -17,28 +9,32 @@ import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateNotFoundException;
 import net.mingsoft.base.constant.Const;
-import net.mingsoft.basic.entity.ColumnEntity;
 import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.basic.util.SpringUtil;
-import net.mingsoft.cms.bean.ColumnArticleIdBean;
 import net.mingsoft.cms.bean.ContentBean;
 import net.mingsoft.cms.constant.e.ColumnTypeEnum;
 import net.mingsoft.cms.entity.CategoryEntity;
 import net.mingsoft.mdiy.bean.PageBean;
-import net.mingsoft.mdiy.biz.IContentModelBiz;
 import net.mingsoft.mdiy.biz.IModelBiz;
 import net.mingsoft.mdiy.biz.impl.ModelBizImpl;
-import net.mingsoft.mdiy.entity.ContentModelEntity;
 import net.mingsoft.mdiy.entity.ModelEntity;
 import net.mingsoft.mdiy.parser.TagParser;
 import net.mingsoft.mdiy.util.ParserUtil;
 import org.apache.commons.lang3.StringUtils;
 
-public class CmsParserUtil extends ParserUtil {
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
+public class CmsParserUtil extends ParserUtil {
+	private static int COLUMN_TYPE_COVER = 2;
 	/**
 	 * 指定模板，指定路径进行生成静态页面，会自定识别pc与移动端
-	 * 
+	 *
 	 * @param templatePath
 	 *            模板路径
 	 * @param targetPath
@@ -53,7 +49,7 @@ public class CmsParserUtil extends ParserUtil {
 		map.put(COLUMN, column);
 		String content = CmsParserUtil.generate(templatePath, map, false);
 		FileUtil.writeString(content, ParserUtil.buildHtmlPath(targetPath), Const.UTF8);
-		
+
 		// 生成移动页面
 		if (ParserUtil.hasMobileFile(templatePath)) {
 			// 手机端m
@@ -188,7 +184,7 @@ public class CmsParserUtil extends ParserUtil {
 
 	/**
 	 * 生成内容
-	 * 
+	 *
 	 * @param articleIdList
 	 *            文章集合
 	 * @return
@@ -227,7 +223,7 @@ public class CmsParserUtil extends ParserUtil {
 			}
 
 			// 判断文件是否存在，若不存在弹出返回信息
-			if (!FileUtil.exist(ParserUtil.buildTempletPath(columnUrl))) {
+			if (!FileUtil.exist(ParserUtil.buildTempletPath(columnUrl))||StringUtils.isBlank(articleIdList.get(artId).getCategoryId())) {
 				artId++;
 				continue;
 			}