1

.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/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/Learn.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/Learn.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -253,7 +253,7 @@
       <workItem from="1678236784872" duration="19064000" />
       <workItem from="1678322422199" duration="23277000" />
       <workItem from="1678410737283" duration="21226000" />
-      <workItem from="1678495559564" duration="4062000" />
+      <workItem from="1678495559564" duration="4345000" />
     </task>
     <servers />
   </component>

application/nutrition/controller/Learn.php

@@ -34,7 +34,7 @@ class Learn extends Controller
         $this->title = '列表';
         $where= [];
         $where[] = ['type','=',input('type',1)];
-        $where[] = ['l.is_deleted','in','1,2'];
+        $where[] = ['l.is_deleted','in','0,1'];
         if(input('first_id'))  $where[] = ['first_id','=',input('first_id')];
         if(input('second_id'))  $where[] = ['second_id','=',input('second_id')];
         $query = $this->_query($this->table)