wupengfei 2 years ago
parent
commit
0470e6b1bc
2 changed files with 9 additions and 7 deletions
  1. 8 6
      .idea/workspace.xml
  2. 1 1
      application/api/controller/Expedite.php

+ 8 - 6
.idea/workspace.xml

@@ -3,7 +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/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -206,7 +206,9 @@
       <workItem from="1671755452818" duration="9153000" />
       <workItem from="1671843798040" duration="608000" />
       <workItem from="1672014482595" duration="6611000" />
-      <workItem from="1672102740019" duration="2780000" />
+      <workItem from="1672102740019" duration="3380000" />
+      <workItem from="1672186838373" duration="4384000" />
+      <workItem from="1672274308370" duration="1499000" />
     </task>
     <servers />
   </component>
@@ -286,10 +288,10 @@
     </state>
     <state x="212" y="108" width="1457" height="809" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1671196737449" />
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670291222413" />
-    <state x="1064" y="382" key="FileChooserDialogImpl" timestamp="1672116447881">
+    <state x="1064" y="382" key="FileChooserDialogImpl" timestamp="1672280084085">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="1064" y="382" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1672116447881" />
+    <state x="1064" y="382" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1672280084085" />
     <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1670578042981" />
     <state x="981" y="616" key="VCS.ChangelistChooser" timestamp="1667975342482">
       <screen x="0" y="0" width="2560" height="1400" />
@@ -299,10 +301,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="793" y="524" key="VcsDiffUtil.ChangesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1667975468009" />
-    <state x="400" y="215" key="com.intellij.ide.util.TipDialog" timestamp="1672014630234">
+    <state x="400" y="215" key="com.intellij.ide.util.TipDialog" timestamp="1672279950078">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="400" y="215" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1672014630234" />
+    <state x="400" y="215" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1672279950078" />
     <state x="533" y="290" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1670547524889" />
     <state x="875" y="449" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1671670365243">
       <screen x="0" y="0" width="1920" height="1040" />

+ 1 - 1
application/api/controller/Expedite.php

@@ -404,7 +404,7 @@ class Expedite extends Base
             ->field('f.id,f.title,f.content,f.label,f.level,f.browse_num,f.sort,f.create_at,u.name,u.headimg, IFNULL( (SELECT count(DISTINCT r.user_id) FROM dd_forum_reply as r WHERE f.id=r.forum_id),0 ) as reply_num')
             ->when($search_name,function ($query)use ($search_name,$search_time){
                 if($search_name) $query->where('f.title|f.label','like','%'.$search_name.'%');
-                if($search_time) $query->where('create_at','> time',date('Y-m-d H:i:s',strtotime('-'.$search_time.' days')));
+                if($search_time) $query->where('f.create_at','> time',date('Y-m-d H:i:s',strtotime('-'.$search_time.' days')));
 
             })->leftJoin('store_member u','u.id = f.user_id')
             ->where('f.status',1)