diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 8acfb802..5fe0ff02 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -70,6 +70,7 @@ class CorporateMemberController extends Controller }) ->select('members.*') ->selectRaw('(SELECT GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ") AS file_mcu_names from files_mcu WHERE files_mcu.memberid = members.id) AS file_mcu_names') + ->groupBy('corporate_employees.member_id') ->paginate() ->appends($request->all()); return Helper::paginateResources(MemberDataTableResource::collection($members)); @@ -185,7 +186,7 @@ class CorporateMemberController extends Controller $imported_member_data = 0; $failed_member_data = []; - + foreach ($reader->getSheetIterator() as $sheet) { $doc_headers_indexes = []; foreach ($sheet->getRowIterator() as $index => $row) { diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index 80b874ae..3178a7c4 100644 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -349,7 +349,7 @@ class MemberEnrollmentService } } else { // throw new ImportRowException(__('Format Date Invalid'), 0, null, $date_from_row); - return null; + return null; } } @@ -877,7 +877,7 @@ class MemberEnrollmentService } break; case "2": // Member Information Update (Without Replacement Card) - + $this->validateRow($row); $member = Member::query() ->where('member_id', $row['member_id']) @@ -964,10 +964,10 @@ class MemberEnrollmentService $division_id = $division->id; } - + // Bisa disini penyebab data dobel $member->employeds()->updateOrCreate([ - 'division_id' => $division_id + 'member_id' => $member->id ],[ 'corporate_id' => $corporate->id, 'branch_code' => $row['branch_code'], @@ -1107,7 +1107,7 @@ class MemberEnrollmentService ); } - + if (!$memberPolicy) { throw new ImportRowException(__('enrollment.MEMBER_NOT_EXISTS', [ 'member_id' => $row['member_id'],