hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

发布测试版 2.5.0

Browse Source
This commit is contained in:
hawind
2021-11-28 12:06:10 +08:00
parent 672cc966db
commit 8408038188
807 changed files with 94347 additions and 47563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/User/Services/UserAssetService.php
+6 -9
View File
@@ -59,15 +59,12 @@ class UserAssetService
$assets = static::getAssets();
}
$res = [];
if ($roleId > 0) {
foreach ($assets as $key => $asset) {
$rules = (array)json_decode($asset['rules'], true);
foreach ($rules as $key => $rule) {
if (isset($rule[$roleId])) {
$res[$asset['name']][$key] = ($rule[$roleId] > 0 ? $rule[$roleId] : 1);
}
foreach ($assets as $key => $asset) {
$rules = (array)json_decode($asset['rules'], true);
foreach ($rules as $key => $rule) {
if (isset($rule[$roleId])) {
$res[$asset['name']][$key] = ($rule[$roleId] > 0 ? $rule[$roleId] : 1);
}
}
}
app/Gdoo/User/Services/UserService.php
+2 -1
View File
@@ -45,7 +45,8 @@ class UserService
return $user;
}
public static function getUser($user_id = 0) {
public static function getUser($user_id = 0)
{
$user = null;
if ($user_id == 0) {
$user = auth()->user();