|
|
@@ -34,7 +34,7 @@ class AdminRoleClass extends BaseClass
|
|
|
$data['addTime'] = time();
|
|
|
return self::add($data);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//获取商家角色列表 shish 2019.12.10
|
|
|
public static function getRoleList($merchantId)
|
|
|
{
|
|
|
@@ -47,5 +47,20 @@ class AdminRoleClass extends BaseClass
|
|
|
$list = self::getRoleList($merchantId);
|
|
|
return !empty($list) ? array_column($list, 'roleName') : [];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ //更新角色 shish 2019.12.10
|
|
|
+ public static function updateRole($role, $data)
|
|
|
+ {
|
|
|
+ $merchantId = $role['merchantId'];
|
|
|
+ if ($role['roleName'] != $data['roleName']) {
|
|
|
+ $name = $data['roleName'];
|
|
|
+ $nameList = self::getNameList($merchantId);
|
|
|
+ if (in_array($name, $nameList)) {
|
|
|
+ util::fail('名称已经存在');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $id = $role['id'];
|
|
|
+ return self::updateById($id, $data);
|
|
|
+ }
|
|
|
+
|
|
|
}
|