| xqd
@@ -380,12 +380,12 @@ class OrderController extends BaseController
|
|
|
$project_role = $user->getTopRole();
|
|
|
if($project_role) {
|
|
|
$project_role->rights = $project_role->getRights();
|
|
|
- }
|
|
|
- //判断是否有租赁查看权限
|
|
|
- if($project_role->rights['rentView'] == true){
|
|
|
- $items = $this->model->join('users', 'orders.user_id', '=', 'users.id')->select('orders.*', 'users.id as user_id', 'users.name');
|
|
|
- } else {
|
|
|
- $items = $this->model->join('users', 'orders.user_id', '=', 'users.id')->where('type','!=',1)->select('orders.*', 'users.id as user_id', 'users.name');
|
|
|
+ //判断是否有租赁查看权限
|
|
|
+ if($project_role->rights['rentView'] == true){
|
|
|
+ $items = $this->model->join('users', 'orders.user_id', '=', 'users.id')->select('orders.*', 'users.id as user_id', 'users.name');
|
|
|
+ } else {
|
|
|
+ $items = $this->model->join('users', 'orders.user_id', '=', 'users.id')->where('type','!=',1)->select('orders.*', 'users.id as user_id', 'users.name');
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//取对应项目的工点
|