1

.idea/workspace.xml

@@ -4,7 +4,6 @@
     <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/General.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/General.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/log/single.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -571,7 +570,7 @@
       <workItem from="1710808231575" duration="7017000" />
       <workItem from="1710817453185" duration="16334000" />
       <workItem from="1710896140284" duration="18662000" />
-      <workItem from="1710981036861" duration="19597000" />
+      <workItem from="1710981036861" duration="21511000" />
     </task>
     <servers />
   </component>

application/api/controller/General.php

@@ -236,6 +236,13 @@ class General extends Base
                         unset($lists[$k]);
                     }else{
                         $select[] = $v;
+                        if($v['is_regular'] == 0){
+                            $v['fs_time'] = $v['push_time'];
+                            $sort[] = $v['push_time'];
+                        }else{
+                            $v['fs_time'] = $v['create_at'];
+                            $sort[] = $v['create_at'];
+                        }
                     }
                 }else if($v['type'] == 4){
                     $label = Db::name('user_label')->group('user_id')->where('label','in',$v['label'])->column('user_id');
@@ -243,18 +250,26 @@ class General extends Base
                         unset($lists[$k]);
                     }else{
                         $select[] = $v;
+                        if($v['is_regular'] == 0){
+                            $v['fs_time'] = $v['push_time'];
+                            $sort[] = $v['push_time'];
+                        }else{
+                            $v['fs_time'] = $v['create_at'];
+                            $sort[] = $v['create_at'];
+                        }
                     }
                 }
             }else{
                 $select[] = $v;
+                if($v['is_regular'] == 0){
+                    $v['fs_time'] = $v['push_time'];
+                    $sort[] = $v['push_time'];
+                }else{
+                    $v['fs_time'] = $v['create_at'];
+                    $sort[] = $v['create_at'];
+                }
             }
-            if($v['is_regular'] == 0){
-                $v['fs_time'] = $v['push_time'];
-                $sort[] = $v['push_time'];
-            }else{
-                $v['fs_time'] = $v['create_at'];
-                $sort[] = $v['create_at'];
-            }
+
         }
        // $adds = array_values($select);
 //        return $page_k.'-'.$page_e;