fix : Member 모델에서 User 모델로 변경
This commit is contained in:
@@ -3,8 +3,7 @@
|
||||
namespace App\Services;
|
||||
|
||||
use App\Helpers\ApiResponse;
|
||||
use App\Models\Member;
|
||||
use App\Models\MemberCompany;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class MemberService
|
||||
@@ -27,10 +26,10 @@ public static function getMembers(string $userToken, bool $debug = false)
|
||||
*/
|
||||
public static function getMember(int $userNo, bool $debug = false)
|
||||
{
|
||||
|
||||
$query = Member::where('mb_num', $userNo);
|
||||
|
||||
return ApiResponse::response('first', $query, $debug);
|
||||
$query = User::whereHas('userTenants', function($q) {
|
||||
$q->active();
|
||||
})->where('id', $userNo);
|
||||
return ApiResponse::response('first', $query);
|
||||
}
|
||||
|
||||
|
||||
@@ -40,8 +39,9 @@ public static function getMember(int $userNo, bool $debug = false)
|
||||
public static function getMyInfo($request, bool $debug = false)
|
||||
{
|
||||
|
||||
$member = $request->user();
|
||||
$company = MemberCompany::where('mc_num',$member->tn_num)->first();
|
||||
$apiUser = app('api_user');
|
||||
|
||||
$user = User::find($apiUser);
|
||||
$data=[
|
||||
'member' => $member,
|
||||
'company' => $company
|
||||
|
||||
Reference in New Issue
Block a user