1

.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <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/Datum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Datum.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -590,7 +593,7 @@
       <workItem from="1713313957989" duration="22457000" />
       <workItem from="1713400278236" duration="25153000" />
       <workItem from="1713486783613" duration="18361000" />
-      <workItem from="1713916802858" duration="2141000" />
+      <workItem from="1713916802858" duration="2640000" />
     </task>
     <servers />
   </component>
@@ -752,15 +755,6 @@
           <option name="timeStamp" value="8" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="php-line-method">
-          <url>file://$PROJECT_DIR$/application/api/controller/Datum.php</url>
-          <line>778</line>
-          <properties>
-            <option name="className" value="\app\api\controller\Datum" />
-            <option name="methodName" value="getDatumCollect" />
-          </properties>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="php-line-method">
           <url>file://$PROJECT_DIR$/application/api/controller/Qc.php</url>
           <line>27</line>
           <properties>

application/api/controller/Datum.php

@@ -1051,7 +1051,7 @@ class Datum extends Base
                 $order =  ['is_top'=>'desc','id'=>'desc'];
                 break;
             default:
-                $order =  ['is_top'=>'desc','like_times'=>'desc'];
+                $order =  ['is_top'=>'desc','like_times'=>'desc','id'=>'desc'];
                 break;
         }
         $list  =DatumComment::where($where)