|
|
@@ -9,6 +9,7 @@ use App\UserDetail;
|
|
|
use App\UserWorkgroup;
|
|
|
use Doctrine\DBAL\Configuration;
|
|
|
use Exception;
|
|
|
+use Illuminate\Database\Eloquent\Builder;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Http\Response;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
@@ -26,7 +27,8 @@ class UserController extends Controller
|
|
|
public function index(Request $request)
|
|
|
{
|
|
|
if(!Gate::allows('用户-查询')){ return redirect(url('/')); }
|
|
|
- $query = User::with(['roles','logistics','userWorkgroups','suppliers']);
|
|
|
+ $userDetailQuery = UserDetail::query()->select('user_id')->where('type','临时工');
|
|
|
+ $query = User::with(['roles','logistics','userWorkgroups','suppliers','userDetail'])->whereNotIn('id',$userDetailQuery);
|
|
|
if($request->has('user')){
|
|
|
$query->where('name','like',$request->input('user'));
|
|
|
}
|