1

.idea/workspace.xml

@@ -3,7 +3,9 @@
   <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/nutrition/controller/SeriesCate.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesCate.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleCate.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleCate.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/ArticleSeriesCate.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/ArticleSeriesCate.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/VideoCate.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/VideoCate.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -182,7 +184,7 @@
       <workItem from="1668473035617" duration="5552000" />
       <workItem from="1668559891944" duration="1972000" />
       <workItem from="1668562566617" duration="3108000" />
-      <workItem from="1668644889000" duration="1650000" />
+      <workItem from="1668644889000" duration="1745000" />
     </task>
     <servers />
   </component>

application/nutrition/controller/ArticleCate.php

@@ -107,7 +107,7 @@ class ArticleCate extends Controller
             // 选择自己的上级分类
             if (empty($vo['pid']) && $this->request->get('pid', '0')) $vo['pid'] = $this->request->get('pid', '0');
             // 列出可选上级分类
-            $menus = Db::name($this->table)->where(['status' => '1'])->order('sort desc,id asc')->column('id,pid,title,logo');
+            $menus = Db::name($this->table)->where(['status' => '1','is_deleted'=>0])->order('sort desc,id asc')->column('id,pid,title,logo');
             $this->menus = Data::arr2table(array_merge($menus, [['id' => '0', 'pid' => '-1', 'title' => '顶部分类']]));
             if (isset($vo['id'])) foreach ($this->menus as $key => $menu) if ($menu['id'] === $vo['id']) $vo = $menu;
             foreach ($this->menus as $key => &$menu) {

application/nutrition/controller/ArticleSeriesCate.php

@@ -107,7 +107,7 @@ class ArticleSeriesCate extends Controller
             // 选择自己的上级分类
             if (empty($vo['pid']) && $this->request->get('pid', '0')) $vo['pid'] = $this->request->get('pid', '0');
             // 列出可选上级分类
-            $menus = Db::name($this->table)->where(['status' => '1'])->order('sort desc,id asc')->column('id,pid,title,logo');
+            $menus = Db::name($this->table)->where(['status' => '1','is_deleted'=>0])->order('sort desc,id asc')->column('id,pid,title,logo');
             $this->menus = Data::arr2table(array_merge($menus, [['id' => '0', 'pid' => '-1', 'title' => '顶部分类']]));
             if (isset($vo['id'])) foreach ($this->menus as $key => $menu) if ($menu['id'] === $vo['id']) $vo = $menu;
             foreach ($this->menus as $key => &$menu) {

application/nutrition/controller/VideoCate.php

@@ -108,7 +108,7 @@ class VideoCate extends Controller
             // 选择自己的上级分类
             if (empty($vo['pid']) && $this->request->get('pid', '0')) $vo['pid'] = $this->request->get('pid', '0');
             // 列出可选上级分类
-            $menus = Db::name($this->table)->where(['status' => '1'])->order('sort desc,id asc')->column('id,pid,title,logo');
+            $menus = Db::name($this->table)->where(['status' => '1','is_deleted'=>0])->order('sort desc,id asc')->column('id,pid,title,logo');
             $this->menus = Data::arr2table(array_merge($menus, [['id' => '0', 'pid' => '-1', 'title' => '顶部分类']]));
             if (isset($vo['id'])) foreach ($this->menus as $key => $menu) if ($menu['id'] === $vo['id']) $vo = $menu;
             foreach ($this->menus as $key => &$menu) {