1

.idea/workspace.xml

@@ -4,7 +4,6 @@
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="aa">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleReport.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/nutrition/view/article_report/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/article_report/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -182,7 +181,7 @@
       <workItem from="1667263628412" duration="22693000" />
       <workItem from="1667350901825" duration="20542000" />
       <workItem from="1667437262057" duration="15186000" />
-      <workItem from="1667522664245" duration="2720000" />
+      <workItem from="1667522664245" duration="3816000" />
     </task>
     <servers />
   </component>

application/nutrition/controller/ArticleReport.php

@@ -27,7 +27,7 @@ class ArticleReport extends Controller
         if($this->request->request('name'))      $where[]= ['m.name','like','%'.$this->request->request('phone').'%'];
         if($this->request->request('label'))      $where[]= ['m.label','like','%'.$this->request->request('phone').'%'];
         $where[]= ['f.is_deleted','=',0];
-        $where[]= ['f.type','=',4];
+        $where[]= ['f.type','=',5];
         $query = $this->_query($this->table);
         $query->alias('f')
             ->field('f.* ,m.headimg,m.name')