员工修改

app/business/controllers/AdminController.php

@@ -58,6 +58,7 @@ class AdminController extends BaseController
 		$id = isset($post['id']) && is_numeric($post['id']) ? $post['id'] : 0;
 		unset($post['id']);
 		$originalAdmin = AdminService::getById($id);
+		$post['merchantId'] = $this->merchantId;
 		AdminService::updateAdmin($originalAdmin, $post);
 		util::ok('修改成功');
 	}
@@ -143,7 +144,7 @@ class AdminController extends BaseController
 		AdminService::updateById($id, ['remind' => $remind]);
 		util::ok();
 	}
-
+	
 	//启用与停用 shish 2020.1.4
 	public function actionUpdateStatus()
 	{
@@ -155,5 +156,5 @@ class AdminController extends BaseController
 		AdminService::updateById($id, ['status' => $status]);
 		util::ok();
 	}
-
+	
 }

biz/admin/classes/AdminClass.php

@@ -49,7 +49,7 @@ class AdminClass extends BaseClass
 	{
 		$detail = self::getById($id);
 		if (empty($detail)) {
-			util::fail('没有找到员工信息'.$id.'|');
+			util::fail('没有找到员工信息' . $id . '|');
 		}
 		$list = self::groupAdminBaseInfo([$detail]);
 		return current($list);
@@ -146,6 +146,7 @@ class AdminClass extends BaseClass
 		$id = $admin['id'];
 		//验证角色
 		$roleId = $data['roleId'];
+		$merchantId = $data['merchantId'];
 		if ($roleId != $admin['roleId']) {
 			$role = AdminRoleClass::getById($roleId);
 			AdminRoleClass::valid($role, $merchantId);