Merge branch 'dev_process_action_wf' of wugg/phpstock into version1.5

app/admin/controller/Proorder.php

@@ -57,7 +57,8 @@ public function __construct(App $app)
             $db->where(function ($query) use ($param) {
                 //所属角色
                 $role = $this->checkRole();
-                if (!empty($role['write']) || $role['roleid'] == 33) $query->whereFindInSet('roleid', $role['roleid']);
+//                if (!empty($role['write']) || $role['roleid'] == 33) $query->whereFindInSet('roleid', $role['roleid']);
+                $query->whereFindInSet('roleid', $role['roleid']);
 
                 //本人id
                 $user = GetUserInfo($param['token']);