|
|
@@ -53,17 +53,22 @@ class ArticleController extends BaseController
|
|
|
*/
|
|
|
public function actionList(){
|
|
|
$cid = \Yii::$app->request->get('cid');
|
|
|
- $condition = ' AND STATUS=1';
|
|
|
+ $condition = ' AND A.STATUS=1';
|
|
|
$params = [];
|
|
|
if($cid){
|
|
|
$condition .= ' AND CID=:CID';
|
|
|
$params[':CID'] = $cid;
|
|
|
}
|
|
|
$data = Article::lists($condition, $params, [
|
|
|
- 'select' => 'ID,TITLE,CID,CREATED_AT',
|
|
|
- 'orderBy' => 'CREATED_AT DESC',
|
|
|
+ 'select' => 'A.ID,A.TITLE,A.CID,A.CREATED_AT,C.CATE_NAME',
|
|
|
+ 'from' => Article::tableName().' AS A',
|
|
|
+ 'join' => [
|
|
|
+ ['LEFT JOIN', ArticleCategory::tableName() . ' AS C', 'A.CID = C.ID'],
|
|
|
+ ],
|
|
|
+ 'orderBy' => 'A.CREATED_AT DESC',
|
|
|
'useSlaves' => true,
|
|
|
]);
|
|
|
+
|
|
|
// 全部分类
|
|
|
$data['allCategory'] = ArticleCategory::getAllCategory();
|
|
|
return static::notice($data);
|