zhangl 3 ay önce
ebeveyn
işleme
55ff1a47b2

+ 1 - 1
backendApi/modules/v1/models/lists/ad/AdIndexList.php

@@ -30,7 +30,7 @@ class AdIndexList extends \common\libs\dataList\DataList implements DataListInte
             'join' => [
                 ['INNER JOIN', Countries::tableName() . ' AS ADC', 'ADC.ID=AD.COUNTRY_ID'],
             ],
-            'orderBy' => 'AD.STATUS DESC,AD.SORT DESC,AD.CREATED_AT ASC',
+            'orderBy' => 'AD.STATUS DESC,AD.SORT DESC,AD.CREATED_AT DESC',
         ]);
     }
 

+ 1 - 1
backendApi/modules/v1/models/lists/article/IndexList.php

@@ -28,7 +28,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
             'join' => [
                 ['INNER JOIN', Countries::tableName() . ' AS ADC', 'ADC.ID=ART.COUNTRY_ID'],
             ],
-            'orderBy' => 'ART.SORT ASC,ART.CREATED_AT DESC',
+            'orderBy' => 'ART.STATUS DESC, ART.SORT DESC, ART.CREATED_AT DESC',
         ]);
     }
 

+ 2 - 2
frontendApi/modules/v1/controllers/ArticleController.php

@@ -23,12 +23,12 @@ class ArticleController extends BaseController
      */
     public function actionIndex()
     {
-        $news=ArticleCategory::find()->select('ID,CATE_NAME')->asArray()->all();
+        $news = ArticleCategory::find()->select('ID,CATE_NAME')->asArray()->all();
         foreach ($news as &$value){
             $value['LISTS']=Article::find()
                 ->select('ID,TITLE,CID,CREATED_AT')
                 ->where('CID=:CID AND STATUS=1 AND COUNTRY_ID=:COUNTRY_ID', [':CID'=>$value['ID'], ':COUNTRY_ID'=>$baseInfo['COUNTRY_ID']])
-                ->orderBy('SORT ASC')
+                ->orderBy('SORT DESC')
                 ->orderBy('CREATED_AT DESC')
                 ->limit(5)
                 ->asArray()

+ 9 - 3
frontendApi/modules/v1/controllers/DashboardController.php

@@ -42,8 +42,13 @@ class DashboardController extends BaseController
      */
     public function actionIndex(){
         $nowTime = Date::nowTime();
-        $baseInfo=Info::baseInfoZh(\Yii::$app->user->id);
-        $news=ArticleCategory::find()->select('ID,CATE_NAME')->orderBy('SORT ASC')->orderBy('CREATED_AT DESC')->asArray()->all();
+        $baseInfo = Info::baseInfoZh(\Yii::$app->user->id);
+        $news = ArticleCategory::find()
+            ->select('ID,CATE_NAME')
+            ->orderBy('CREATED_AT DESC')
+            ->asArray()
+            ->all();
+
         $where = ' CID=:CID AND STATUS=1 AND COUNTRY_ID=:COUNTRY_ID';
         foreach ($news as &$value){
             $params = [
@@ -52,7 +57,8 @@ class DashboardController extends BaseController
             ];
             $value['LISTS'] = Article::find()
                 ->select('ID,TITLE,CID,CREATED_AT')
-                ->where($where,$params)
+                ->where($where, $params)
+                ->orderBy('SORT DESC')
                 ->orderBy('CREATED_AT DESC')
                 ->limit(6)
                 ->asArray()