|
|
@@ -877,7 +877,7 @@ public class ProgrammeService {
|
|
|
dto.setRemark(programmeScore.getRemark());
|
|
|
dto.setSecond(programmeScore.isSecond());
|
|
|
}
|
|
|
- if (CollUtil.isNotEmpty(participantMap)) {
|
|
|
+ if (CollUtil.isNotEmpty(participantMap.get(programme.getId()))) {
|
|
|
List<String> participants = participantMap.get(programme.getId())
|
|
|
.stream()
|
|
|
.map(Participant::getName)
|
|
|
@@ -968,7 +968,7 @@ public class ProgrammeService {
|
|
|
List<ArtType> artTypes = artTypeRepo.findAll();
|
|
|
|
|
|
String finalArtCode = artCode;
|
|
|
- Page<Programme> all = programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
|
|
|
+ Page<Programme> all = programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
|
|
|
List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
|
|
|
if (StrUtil.isNotBlank(finalArtCode)) {
|
|
|
and.add(root.get("specialtyId").in(artTypeService.getIds(artTypes, finalArtCode)));
|
