1

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Press.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Press.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Recruit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Recruit.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -167,7 +168,7 @@
       <workItem from="1661430114608" duration="642000" />
       <workItem from="1661520525074" duration="602000" />
       <workItem from="1666574984353" duration="7852000" />
-      <workItem from="1666659002848" duration="9857000" />
+      <workItem from="1666659002848" duration="13616000" />
     </task>
     <servers />
   </component>

application/api/controller/Press.php

@@ -42,6 +42,7 @@ class Press extends Base
      * @url /api/Press/getPressList
      * @header name:Authorization require:1 desc:Token
      * @param  name:title type:string default:-- desc:标题
+     * @param  name:sort_type type:int default:1 desc:1默认2时间升序3时间降序
      * @param  name:page type:int default:0 desc:页数
      * @param  name:page_num type:int default:20 desc:每页数
      * @return name:title type:string default:-- desc:标题
@@ -59,12 +60,26 @@ class Press extends Base
      */
     public function getPressList(){
         $title = input('get.title');
+
+        $sort_type = input('get.sort_type',1);
+        switch ($sort_type) {
+            case 1:
+                $order =   ['sort'=>'desc','id'=>'desc'];
+                break;
+            case 2:
+                $order =   ['id'=>'asc','sort'=>'desc'];
+                break;
+            case 3:
+                $order =   ['id'=>'desc','sort'=>'desc'];
+                break;
+        }
+
         if($title && $this->user_id) UserSearch::saveSearchTitle($this->user_id,$title,4);
         $list = \app\common\model\Press::where(['is_deleted'=>0])
             ->field('id,images,title,content,read_num,create_at,transmit_num')
             ->when($title,function ($query)use($title){
             if($title) $query->where('title','like','%'.$title.'%');
-        })->order('sort desc,id desc')->limit($this->off_set,$this->page_num)->select()->toArray();
+        })->order($order)->limit($this->off_set,$this->page_num)->select()->toArray();
         foreach ($list as &$v) {
             $v['comment_num'] = PressComment::where(['first_id'=>$v['id'],'type'=>1])->count();
             $v['is_collect'] = UserCollect::checkCollectByType($this->user_id,4,$v['id']);

application/api/controller/Recruit.php

@@ -190,9 +190,18 @@ class Recruit extends Base
         $sort_type = input('get.sort_type',1);
         $first_classify = input('get.first_classify');
         $second_classify = input('get.second_classify');
-        $order = ' sort desc ,id desc';
-        if($sort_type == 2)$order = ' id asc , sort desc';
-        if($sort_type == 3)$order = ' id desc , sort desc';
+        switch ($sort_type) {
+            case 1:
+                $order =   ['sort'=>'desc','id'=>'desc'];
+                break;
+            case 2:
+                $order =   ['id'=>'asc','sort'=>'desc'];
+                break;
+            case 3:
+                $order =   ['id'=>'desc','sort'=>'desc'];
+                break;
+        }
+
         $sel_where = [];
         $sel_where[] = ['is_deleted','=',0];
         $sel_where[] = ['status','=',1];