update

@@ -118,4 +118,8 @@ class ComController extends BaseController
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
+
+    public function uploads(){
+
+    }
 }
 }

@@ -41,7 +41,7 @@ class DepartmentLogic extends  BaseLogic
                 continue;
                 continue;
             }
             }
             //是否有子部门
             //是否有子部门
-            if(Department::where('pid', $id)->count()){
+            if(Department::where('project_id', $this->user['project_id'])->where('pid', $id)->count()){
                 $this->fail("部门{$info['title']}存在下级部门，不能删除");
                 $this->fail("部门{$info['title']}存在下级部门，不能删除");
             }
             }
         }
         }

@@ -43,7 +43,7 @@ class CategoryLogic extends  BaseLogic
                 continue;
                 continue;
             }
             }
             //是否有子分类
             //是否有子分类
-            if(Category::where('pid', $id)->count()){
+            if(Category::where('project_id', $this->user['project_id'])->where('pid', $id)->count()){
                 $this->fail("分类{$info['title']}存在子分类，不能删除");
                 $this->fail("分类{$info['title']}存在子分类，不能删除");
             }
             }
             //是否有对应商品
             //是否有对应商品