| xqd
@@ -51,11 +51,6 @@ class ProjectController extends BaseController
|
|
|
public function get(Request $request)
|
|
|
{
|
|
|
$items = $this->model->where('id','!=','1')->orderBy('id', 'desc')->orderBy('created_at', 'desc');
|
|
|
- $user_id = request('user_id');
|
|
|
- if ($user_id == null)
|
|
|
- {
|
|
|
- $user_id = 0;
|
|
|
- }
|
|
|
$tmp_items = collect(['name']);
|
|
|
foreach($tmp_items as $tmp_item) {
|
|
|
if($request->has($tmp_item) && !empty($request->input($tmp_item))) {
|
| xqd
@@ -78,7 +73,11 @@ class ProjectController extends BaseController
|
|
|
if($request->input('type') == 'apply') {
|
|
|
$items = $items->whereNotNull('user_id');
|
|
|
}
|
|
|
- if($request->input('user_id')){
|
|
|
+ $user_id = request('user_id');
|
|
|
+ if(empty($user_id)){
|
|
|
+ $user_id = 0;
|
|
|
+ }
|
|
|
+ if($user_id){
|
|
|
$items->whereHas('project_user',function ($query){
|
|
|
$query->where('project_role_id','=','4');
|
|
|
$query->whereHas('user',function ($query){
|