|
@@ -161,13 +161,13 @@ public class StudentSpecification extends PagingAndSortingSpecification {
|
|
|
predicates.add(cb.equal(root.get("examNumber"), endNumber));
|
|
|
}
|
|
|
if (getUpload() != null && !getUpload()) {
|
|
|
- if (Objects.nonNull(getSubject())) {
|
|
|
+ if (Objects.nonNull(getSubject()) && !getSubject().isEmpty()) {
|
|
|
predicates.add(cb.like(root.get("uploadStatus"), "%" + getSubject() + ":0" + "%"));
|
|
|
} else {
|
|
|
predicates.add(cb.equal(root.get("uploadStatus"), "SX:0,SC:0,SM:0"));
|
|
|
}
|
|
|
} else if (getUpload() != null && getUpload()) {
|
|
|
- if (Objects.nonNull(getSubject())) {
|
|
|
+ if (Objects.nonNull(getSubject()) && !getSubject().isEmpty()) {
|
|
|
predicates.add(cb.like(root.get("uploadStatus"), "%" + getSubject() + ":1" + "%"));
|
|
|
} else {
|
|
|
predicates.add(cb.equal(root.get("uploadStatus"), "SX:1,SC:1,SM:1"));
|