-
diff --git a/app/common/model/Document.php b/app/common/model/Document.php
index 2231e26..f0364c1 100644
--- a/app/common/model/Document.php
+++ b/app/common/model/Document.php
@@ -15,6 +15,11 @@ use think\db\exception\ModelNotFoundException;
*/
class Document extends BaseModel
{
+ //文档类型
+ const DOCUMENT_TYPE_ARTICLE = "article";
+ const DOCUMENT_TYPE_PAGE = "page";
+ const DOCUMENT_TYPE_CATEGORY = "product";
+
/**
* 列表
* @param $where
@@ -28,6 +33,7 @@ class Document extends BaseModel
public static function systemPage($where): array
{
$model = new self;
+ $model = $model->where("type", "=",$where['type']?:self::DOCUMENT_TYPE_ARTICLE);
if ($where['title'] != '') $model = $model->where("title", "like", "%$where[title]%");
if ($where['start_time'] != '') $model = $model->where("create_time", ">", strtotime($where['start_time'] . " 00:00:00"));
if ($where['end_time'] != '') $model = $model->where("create_time", "<", strtotime($where['end_time'] . " 23:59:59"));
diff --git a/app/common/model/DocumentArticle.php b/app/common/model/DocumentArticle.php
index b1d6872..9e2f8a7 100644
--- a/app/common/model/DocumentArticle.php
+++ b/app/common/model/DocumentArticle.php
@@ -4,6 +4,7 @@
namespace app\common\model;
+use app\common\model\Document as aModel;
use think\db\exception\DataNotFoundException;
use think\db\exception\DbException;
use think\db\exception\ModelNotFoundException;
@@ -16,23 +17,19 @@ use think\db\exception\ModelNotFoundException;
*/
class DocumentArticle extends BaseModel
{
- /**
- * 列表
- * @param $where
- * @return array
- * @throws DataNotFoundException
- * @throws DbException
- * @throws ModelNotFoundException
- * @author 李玉坤
- * @date 2021-02-15 23:24
- */
- public static function systemPage($where): array
+ public function getInfo($id)
{
- $model = new self;
- $count = self::counts($model);
- if ($where['page'] && $where['limit']) $model = $model->page((int)$where['page'], (int)$where['limit']);
- $data = $model->select();
- if ($data) $data = $data->toArray();
- return compact('data', 'count');
+ if (empty($id)){
+ return [];
+ }
+ $info = aModel::alias('a')
+ ->leftJoin('document_article p','a.id = p.id')
+ ->where("a.id",$id)
+ ->where("a.type",Document::DOCUMENT_TYPE_PAGE)
+ ->find();
+ if (!$info){
+ return [];
+ }
+ return $info->toArray();
}
}
\ No newline at end of file
diff --git a/app/common/model/DocumentPage.php b/app/common/model/DocumentPage.php
new file mode 100644
index 0000000..a3c47bd
--- /dev/null
+++ b/app/common/model/DocumentPage.php
@@ -0,0 +1,36 @@
+leftJoin('document_page p','a.id = p.id')
+ ->where("a.id",$id)
+ ->where("a.type",Document::DOCUMENT_TYPE_PAGE)
+ ->find();
+ if (!$info){
+ return [];
+ }
+ return $info->toArray();
+ }
+
+}
\ No newline at end of file
diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php
index 7e27e08..1c53d8f 100644
--- a/app/index/controller/Article.php
+++ b/app/index/controller/Article.php
@@ -118,7 +118,11 @@ class Article extends Base
}
//获取该文章
$documentModel = new Document();
- $article = $documentModel->where('status', 1)->where('id|alias', $id)->find();
+ if (is_numeric($id)){
+ $article = $documentModel->where('status', 1)->where('id', $id)->find();
+ }else{
+ $article = $documentModel->where('status', 1)->where('alias', $id)->find();
+ }
if (!$article) {
$this->error('文章不存在或已删除！');
}