From 88c3bb432dcc9d414801e8662d9f7db7dcbc25a3 Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Thu, 9 Jan 2020 08:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8=E5=92=8C?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/PermissionsMiddleware.php |  2 +-
 catch/permissions/controller/Department.php | 35 +++++++++++++++++++++
 catch/permissions/controller/Job.php        |  9 ++++++
 catch/permissions/controller/Permission.php |  4 +--
 catch/permissions/controller/Role.php       |  3 +-
 catch/permissions/model/Department.php      | 25 +++++++++++++++
 catch/permissions/model/Job.php             | 23 ++++++++++++++
 7 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 catch/permissions/controller/Department.php
 create mode 100644 catch/permissions/controller/Job.php
 create mode 100644 catch/permissions/model/Department.php
 create mode 100644 catch/permissions/model/Job.php

diff --git a/catch/permissions/PermissionsMiddleware.php b/catch/permissions/PermissionsMiddleware.php
index 9364a36..e2706e4 100644
--- a/catch/permissions/PermissionsMiddleware.php
+++ b/catch/permissions/PermissionsMiddleware.php
@@ -1,7 +1,7 @@
 <?php
 namespace catchAdmin\permissions;
 
-use app\Request;
+use catcher\base\CatchRequest as Request;
 use catchAdmin\permissions\model\Permissions;
 use catcher\Code;
 use catcher\exceptions\PermissionForbiddenException;
diff --git a/catch/permissions/controller/Department.php b/catch/permissions/controller/Department.php
new file mode 100644
index 0000000..8274d5d
--- /dev/null
+++ b/catch/permissions/controller/Department.php
@@ -0,0 +1,35 @@
+<?php
+namespace catchAdmin\permissions\controller;
+
+use catcher\base\CatchController;
+use catchAdmin\permissions\model\Department as DepartmentModel;
+
+class Department extends CatchController
+{
+    protected $department;
+
+    public function __construct(DepartmentModel $department)
+    {
+        $this->department = $department;
+    }
+
+    public function index()
+    {
+
+    }
+
+    public function save()
+    {
+
+    }
+
+    public function update()
+    {
+
+    }
+
+    public function delete($id)
+    {
+
+    }
+}
diff --git a/catch/permissions/controller/Job.php b/catch/permissions/controller/Job.php
new file mode 100644
index 0000000..ca0b6d3
--- /dev/null
+++ b/catch/permissions/controller/Job.php
@@ -0,0 +1,9 @@
+<?php
+namespace catchAdmin\permissions\controller;
+
+use catcher\base\CatchController;
+
+class Job extends CatchController
+{
+
+}
diff --git a/catch/permissions/controller/Permission.php b/catch/permissions/controller/Permission.php
index cba8b24..c6948d6 100644
--- a/catch/permissions/controller/Permission.php
+++ b/catch/permissions/controller/Permission.php
@@ -2,10 +2,8 @@
 namespace catchAdmin\permissions\controller;
 
 
-use app\Request;
+use catcher\base\CatchRequest as Request;
 use catcher\base\CatchController;
-use catcher\CatchAdmin;
-use catcher\CatchForm;
 use catcher\CatchResponse;
 use catcher\exceptions\FailedException;
 use catcher\Tree;
diff --git a/catch/permissions/controller/Role.php b/catch/permissions/controller/Role.php
index d9c1315..532a29d 100644
--- a/catch/permissions/controller/Role.php
+++ b/catch/permissions/controller/Role.php
@@ -1,9 +1,8 @@
 <?php
 namespace catchAdmin\permissions\controller;
 
-use app\Request;
+use catcher\base\CatchRequest as Request;
 use catcher\base\CatchController;
-use catcher\CatchForm;
 use catcher\CatchResponse;
 use catcher\exceptions\FailedException;
 use catcher\Tree;
diff --git a/catch/permissions/model/Department.php b/catch/permissions/model/Department.php
new file mode 100644
index 0000000..1446c35
--- /dev/null
+++ b/catch/permissions/model/Department.php
@@ -0,0 +1,25 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+use catcher\base\CatchModel;
+
+class Department extends CatchModel
+{
+    protected $name = 'department';
+    
+    protected $field = [
+            'id', // 
+			'department_name', // 部门名称
+			'parent_id', // 父级ID
+			'principal', // 负责人
+			'mobile', // 联系电话
+			'email', // 联系又想
+			'creator_id', // 创建人ID
+			'status', // 1 正常 2 停用
+			'sort', // 排序字段
+			'created_at', // 创建时间
+			'updated_at', // 更新时间
+			'deleted_at', // 删除状态，null 未删除 timestamp 已删除
+			   
+    ];  
+}
\ No newline at end of file
diff --git a/catch/permissions/model/Job.php b/catch/permissions/model/Job.php
new file mode 100644
index 0000000..7a2dce4
--- /dev/null
+++ b/catch/permissions/model/Job.php
@@ -0,0 +1,23 @@
+<?php
+namespace catchAdmin\permissions\model;
+
+use catcher\base\CatchModel;
+
+class Job extends CatchModel
+{
+    protected $name = 'job';
+    
+    protected $field = [
+            'id', // 
+			'job_name', // 岗位名称
+			'coding', // 编码
+			'creator_id', // 创建人ID
+			'status', // 1 正常 2 停用
+			'sort', // 排序字段
+			'description', // 描述
+			'created_at', // 创建时间
+			'updated_at', // 更新时间
+			'deleted_at', // 删除状态，null 未删除 timestamp 已删除
+			   
+    ];  
+}
\ No newline at end of file