Merge branch 'liuzj-permission-dev' into test

modules/Jiesuan/Http/Controllers/JiesuanController.php

@@ -130,8 +130,8 @@ class JiesuanController extends CatchController
     }
 
     private function getCompanyUid(Request $request) {
-        if($this->isOptimizer()) {
-            return $this->getOptimizerUid();
+        if($this->isCompanyManager()) {
+            return $this->getLoginUserId();
         } else {
             return $request->input('company_uid');
         }

modules/User/Http/Controllers/UserTrait.php

@@ -94,4 +94,12 @@ trait UserTrait
     public function isOptimizer() {
         return $this->listUserRoles()->contains('optimizer');
     }
+
+    /**
+     * 是否是公司管理员
+     * @return bool
+     */
+    public function isCompanyManager() {
+        return $this->listUserRoles()->contains('company');
+    }
 }