diff --git a/app/Admin/Extensions/Exporter/ImportBedExporter.php b/app/Admin/Extensions/Exporter/ImportBedExporter.php index 823351e..5baeb8a 100644 --- a/app/Admin/Extensions/Exporter/ImportBedExporter.php +++ b/app/Admin/Extensions/Exporter/ImportBedExporter.php @@ -167,15 +167,27 @@ class ImportBedExporter extends AbstractExporter implements WithMapping, WithHea } } + $dormitory = ""; + $dormitoryNumber = ""; + $multipleInfo = ""; + if(!empty($dormitoryTypeInfo[$item["dormitory_type"]]["dormitory"])){ + $dormitory = $dormitoryTypeInfo[$item["dormitory_type"]]["dormitory"]; + } + if(!empty($dormitory[$item["dormitory_number"]]["dormitory_number"])){ + $dormitoryNumber = $dormitory[$item["dormitory_number"]]["dormitory_number"]; + } + if(!empty($multipleInfo[$item["multiple_worlds"]]["people"])){ + $multipleInfo = $multipleInfo[$item["multiple_worlds"]]["people"]; + } $data = [ "id" => $item["id"], "sex" => $item["sex"] == 1 ? "男" : "女", - "dormitory" => $dormitoryTypeInfo[$item["dormitory_type"]]["dormitory"], - "multipleInfo" => $multipleInfo[$item["multiple_worlds"]]["people"], + "dormitory" => $dormitory, + "multipleInfo" => $multipleInfo, "livingInfo" => $livingInfo[$item["living_area"]]["title"], "buildingInfo" => $buildingInfo[$item["building_id"]]["building_title"], "floorInfo" => $floorInfo[$item["floor_id"]]["floor_title"], - "dormitoryNumber" => $dormitory[$item["dormitory_number"]]["dormitory_number"], + "dormitoryNumber" => $dormitoryNumber, "bedNumber" => $bed[$item["bed_id"]]["bed_number"], "collegeInfo" => $collegeInfo[$specialityInfo[$item["speciality_id"]]["secondary_college_id"]]["name"], "specialityName" => $specialityInfo[$item["speciality_id"]]["speciality_name"], diff --git a/app/Services/PublicServices.php b/app/Services/PublicServices.php index 806b06a..07abbbb 100644 --- a/app/Services/PublicServices.php +++ b/app/Services/PublicServices.php @@ -27,6 +27,9 @@ class PublicServices extends BaseServices $studentInfo = AdmissionNewStudents::query()->where([ "idCard" => $idcard ])->first(); - return $studentInfo->is_new_student; + if(!empty($studentInfo)){ + return $studentInfo->is_new_student; + } + } }