Просмотр исходного кода

feat: EK-2806: 会员端Promo和banner图增加分国家设置.

kevin 3 месяцев назад
Родитель
Сommit
0cf7edc3db
2 измененных файлов с 16 добавлено и 8 удалено
  1. 3 8
      backendApi/modules/v1/controllers/ArticleController.php
  2. 13 0
      common/models/Article.php

+ 3 - 8
backendApi/modules/v1/controllers/ArticleController.php

@@ -9,6 +9,7 @@ namespace backendApi\modules\v1\controllers;
 
 use backendApi\modules\v1\models\Admin;
 use backendApi\modules\v1\models\AdminCountry;
+use backendApi\modules\v1\models\lists\user\IndexList;
 use common\helpers\Cache;
 use common\helpers\Form;
 use common\models\Article;
@@ -122,14 +123,8 @@ class ArticleController extends BaseController
             $condition .= ' AND ART.COUNTRY_ID IN (' . implode(',', $placeholders) . ')';
         }
 
-        $data = Article::lists($condition, $params, [
-            'select' => 'ART.ID,ART.TITLE,ART.CID,ART.COUNTRY_ID,ART.STATUS,ART.SORT,ART.CREATED_AT,,ADC.NAME AS COUNTRY_NAME, ADC.CODE AS COUNTRY_CODE',
-            'from' => Article::tableName().' AS ART',
-            'join' => [
-                ['INNER JOIN', Countries::tableName() . ' AS ADC', 'ADC.ID=ART.COUNTRY_ID'],
-            ],
-            'orderBy' => 'ART.SORT ASC,ART.CREATED_AT DESC',
-        ]);
+        $obj = new Article();
+        $data = $obj->getList(['condition' => $condition, 'params' => $params]);
 
         // 全部分类
         $data['allCategory'] = ArticleCategory::getAllCategory();

+ 13 - 0
common/models/Article.php

@@ -29,6 +29,19 @@ class Article extends \common\components\ActiveRecord
         return '{{%ARTICLE}}';
     }
 
+    public function dataHandle()
+    {
+        $this->condition .= '';
+        $this->listData = Article::lists($this->condition, $this->params, [
+            'select' => 'ART.ID,ART.TITLE,ART.CID,ART.COUNTRY_ID,ART.STATUS,ART.SORT,ART.CREATED_AT,,ADC.NAME AS COUNTRY_NAME, ADC.CODE AS COUNTRY_CODE',
+            'from' => Article::tableName().' AS ART',
+            'join' => [
+                ['INNER JOIN', Countries::tableName() . ' AS ADC', 'ADC.ID=ART.COUNTRY_ID'],
+            ],
+            'orderBy' => 'ART.SORT ASC,ART.CREATED_AT DESC',
+        ]);
+    }
+
     /**
      * @inheritdoc
      */