|
@@ -158,7 +158,10 @@ public class EnrollInfoServiceImpl extends ServiceImpl<EnrollInfoMapper, EnrollI
|
|
log.error("报名信息反序列化失败", e);
|
|
log.error("报名信息反序列化失败", e);
|
|
}
|
|
}
|
|
return null;
|
|
return null;
|
|
- }).filter(data -> null != data && data.getStatus() == 1 && (!TextUtils.isEmpty(type) && type.equals(data.getType())))
|
|
|
|
|
|
+ }).filter(data ->
|
|
|
|
+ {
|
|
|
|
+ return null != data && data.getStatus() == 1 && (TextUtils.isEmpty(type) || type.equals(data.getType()));
|
|
|
|
+ })
|
|
.sorted(comparing).collect(Collectors.toList());
|
|
.sorted(comparing).collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
|