Merge branch 'liuzj-permission-dev' into test

modules/Jiesuan/Http/Controllers/BankAccountController.php

@@ -45,6 +45,7 @@ class BankAccountController extends CatchController
         } else {
             $data['status'] = 1;
             $data['updated_at'] = $data['created_at'] = $now;
+            $data['company_uid'] = $company_uid;
             DB::table('bank_cards')
                 ->insert($data);
         }

modules/User/Models/User.php

@@ -115,11 +115,16 @@ class User extends Model implements AuthenticatableContract
      * 否则展示所有isApp为false以及showApp对应的name的模块
      * @param string $showApp
      */
-    
+
     public function showPermissions($showApp = '') {
-        $hiddenAppModuleNames = Modules::getAppModules()->reject(function ($module) use ($showApp) {
-            return $showApp == $module['name'];
-        })->pluck('name');
+        $appModules = Modules::getAppModules();
+        if(!is_null($appModules)) {
+            $hiddenAppModuleNames = $appModules->reject(function ($module) use ($showApp) {
+                return $showApp == $module['name'];
+            })->pluck('name');
+        } else {
+            $hiddenAppModuleNames = collect();
+        }
         $enablePermissions = $this->getAttribute('permissions')->reject(function ($permission) use ($hiddenAppModuleNames){
             return $hiddenAppModuleNames->contains($permission['module']);
         })->values()->all();