Browse Source

删除员工

shish 6 years ago
parent
commit
569cba6595
3 changed files with 28 additions and 2 deletions
  1. 14 0
      app/business/controllers/AdminController.php
  2. 13 2
      biz/admin/classes/AdminClass.php
  3. 1 0
      sql.txt

+ 14 - 0
app/business/controllers/AdminController.php

@@ -2,6 +2,7 @@
 
 namespace business\controllers;
 
+use biz\admin\classes\AdminClass;
 use biz\admin\services\AdminService;
 use common\components\jwt;
 use common\components\util;
@@ -39,5 +40,18 @@ class AdminController extends BaseController
 		$info = AdminService::getDetail($id);
 		util::success($info);
 	}
+	
+	//删除员工 shish 2019.12.9
+	public function actionDelete()
+	{
+		$id = Yii::$app->request->get('id');
+		$admin = AdminClass::getById($id);
+		AdminClass::valid($admin, $this->merchantId);
+		if ($admin['super'] == 1) {
+			util::fail('超级管理员不能删除');
+		}
+		AdminClass::deleteById($id);
+		util::ok();
+	}
 
 }

+ 13 - 2
biz/admin/classes/AdminClass.php

@@ -88,18 +88,29 @@ class AdminClass extends BaseClass
 		return self::getAllByCondition(['merchantId' => $merchantId], null, '*');
 	}
 	
-	//获取员工的名字 shish 2019.12.9
+	//获取商家所有员工的名字 shish 2019.12.9
 	public static function getAdminNameList($merchantId)
 	{
 		$list = self::getAdminList($merchantId);
 		return !empty($list) ? array_column($list, 'adminName') : [];
 	}
 	
-	//员工已经关联微信的userId
+	//获取商家所有员工已经关联微信的userId
 	public static function getAdminRelateUserId($merchantId)
 	{
 		$list = self::getAdminList($merchantId);
 		return !empty($list) ? array_column($list, 'userId') : [];
 	}
+
+	//验证权限
+	public static function valid($admin, $merchantId)
+	{
+		if (empty($admin)) {
+			util::fail('员工无效');
+		}
+		if ($admin['merchantId'] != $merchantId) {
+			util::fail('您没有权限操作此员工');
+		}
+	}
 	
 }

+ 1 - 0
sql.txt

@@ -23,6 +23,7 @@ ALTER TABLE xhAdminRole DROP COLUMN `createTime`;
 ALTER TABLE xhAdminRole DROP COLUMN `updateTime`;
 ALTER TABLE xhAdmin DROP COLUMN `avatar`;
 ALTER TABLE xhAdmin ADD loginTime INT NOT NULL DEFAULT 0 COMMENT '最后登陆时间' AFTER `status`;
+ALTER TABLE xhAdmin ADD `super` TINYINT NOT NULL DEFAULT 0 COMMENT '是否超级管理员 0不是 1是,超级员工不可删除' AFTER `sex`;
 
 2019.12.8 23:06 shish 商品设置
 ALTER TABLE xhGoodsSetting DROP COLUMN `startRiseTime`;