员工管理

app/business/controllers/AdminController.php

@@ -46,12 +46,28 @@ class AdminController extends BaseController
 	{
 		$id = Yii::$app->request->get('id');
 		$admin = AdminClass::getById($id);
-		AdminClass::valid($admin, $this->merchantId);
-		if ($admin['super'] == 1) {
-			util::fail('超级管理员不能删除');
-		}
-		AdminClass::deleteById($id);
+		AdminService::valid($admin, $this->merchantId);
+		AdminService::deleteAdmin($admin, $this->adminId);
 		util::ok();
 	}
-
+	
+	//修改员工 shish 2019.12.9
+	public function actionUpdate()
+	{
+		$post = Yii::$app->request->post();
+		$admin = AdminService::addAdmin($post);
+		$id = $admin['id'];
+		$info = AdminService::getDetail($id);
+		util::success($info);
+	}
+	
+	//查看员工详情 shish 2019.12.9
+	public function actionDetail()
+	{
+		$id = Yii::$app->request->get('id');
+		$admin = AdminService::getDetail($id);
+		AdminClass::valid($admin, $this->merchantId);
+		util::success($admin);
+	}
+	
 }

biz/admin/classes/AdminClass.php

@@ -101,7 +101,7 @@ class AdminClass extends BaseClass
 		$list = self::getAdminList($merchantId);
 		return !empty($list) ? array_column($list, 'userId') : [];
 	}
-
+	
 	//验证权限
 	public static function valid($admin, $merchantId)
 	{
@@ -112,5 +112,18 @@ class AdminClass extends BaseClass
 			util::fail('您没有权限操作此员工');
 		}
 	}
-	
+
+	//删除员工，需要考虑权限 shish 2019.12.9
+	public static function deleteAdmin($admin, $adminId)
+	{
+		$id = $admin['id'];
+		if ($admin['super'] == 1) {
+			util::fail('超级管理员不能删除');
+		}
+		if ($id == $adminId) {
+			util::fail('不能删除自己');
+		}
+		self::deleteById($id);
+	}
+
 }

biz/admin/services/AdminService.php

@@ -90,17 +90,29 @@ class AdminService extends BaseService
 		$data['list'] = AdminClass::groupAdminBaseInfo($list);
 		return $data;
 	}
-
+	
 	//添加员工
 	public static function addAdmin($data)
 	{
 		return AdminClass::addAdmin($data);
 	}
-
+	
 	//获取员工信息 shish 2019.12.8
 	public static function getDetail($id)
 	{
 		return AdminClass::getDetail($id);
 	}
+	
+	//考虑权限情况下删除员工 shish 2019.12.9
+	public static function deleteAdmin($admin, $adminId)
+	{
+		return AdminClass::deleteAdmin($admin, $adminId);
+	}
 
+	//验证权限 shish 2019.12.9
+	public static function valid($admin, $merchantId)
+	{
+		return AdminClass::valid($admin, $merchantId);
+	}
+	
 }