shish пре 6 година
родитељ
комит
3aa674ad2c
2 измењених фајлова са 6 додато и 4 уклоњено
  1. 4 2
      app/business/controllers/AdminController.php
  2. 2 2
      biz/admin/classes/AdminClass.php

+ 4 - 2
app/business/controllers/AdminController.php

@@ -25,11 +25,13 @@ class AdminController extends BaseController
 	public function actionList()
 	{
 		$get = Yii::$app->request->get();
+		$where = [];
 		$where['merchantId'] = $this->merchantId;
+		$where['delStatus'] = 0;
 		$list = AdminService::getAdminList($where);
 		util::success($list);
 	}
-	
+
 	//添加员工 shish 2019.12.8
 	public function actionAdd()
 	{
@@ -44,7 +46,7 @@ class AdminController extends BaseController
 	//删除员工 shish 2019.12.9
 	public function actionDelete()
 	{
-		$id = Yii::$app->request->get('id');
+		$id = Yii::$app->request->post('id');
 		$admin = AdminClass::getById($id);
 		AdminService::valid($admin, $this->merchantId);
 		AdminService::deleteAdmin($admin, $this->adminId);

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

@@ -146,9 +146,9 @@ class AdminClass extends BaseClass
 		if ($id == $adminId) {
 			util::fail('不能删除自己');
 		}
-		self::deleteById($id);
+		self::updateById($id,['delStatus'=>1]);
 	}
-	
+
 	//更新员工 shish 2019.12
 	public static function updateAdmin($admin, $data)
 	{