|
|
@@ -88,9 +88,13 @@ public class ProgrammeService {
|
|
|
String specialty = artTypeRepo.findById(programme.getSpecialtyId())
|
|
|
.orElseThrow(new BusinessException("无专业"))
|
|
|
.getName();
|
|
|
- String setting = settingRepo.findById(programme.getLevelSettingId())
|
|
|
- .orElseThrow(new BusinessException("无分组"))
|
|
|
- .getName();
|
|
|
+ String setting = "";
|
|
|
+ if (ObjectUtil.isNotNull(programme.getLevelSettingId())){
|
|
|
+ setting = settingRepo.findById(programme.getLevelSettingId())
|
|
|
+ .orElseThrow(new BusinessException("无分组"))
|
|
|
+ .getName();
|
|
|
+ }
|
|
|
+
|
|
|
return this.toDTO(programme, performance, organization, gradeOrganization, specialty, setting);
|
|
|
}
|
|
|
|