|
|
@@ -245,7 +245,7 @@ public class SlideServiceImpl implements SlideService {
|
|
|
private void checkSameName(Long slideId, Long courseId, String name) {
|
|
|
long exists = slideDAO.count((Specification<Slide>) (root, query, cb) -> cb.and(
|
|
|
cb.notEqual(root.get("id"), slideId),
|
|
|
- cb.equal(root.get("course").get("Id"), courseId),
|
|
|
+ cb.equal(root.get("course").get("id"), courseId),
|
|
|
cb.equal(root.get("deleteAt"), 0L),
|
|
|
cb.equal(root.get("name"), name)));
|
|
|
|
|
|
@@ -266,7 +266,7 @@ public class SlideServiceImpl implements SlideService {
|
|
|
private Page<Slide> findByCourseIdAndTeacherIdAndKey(Long courseId, Long teacherId, String key, Pageable pageable) {
|
|
|
return slideDAO.findAll(
|
|
|
(Specification<Slide>) (root, query, cb) -> cb.and(
|
|
|
- cb.equal(root.get("course").get("Id"), courseId),
|
|
|
+ cb.equal(root.get("course").get("id"), courseId),
|
|
|
cb.equal(root.get("teacher").get("id"), teacherId),
|
|
|
cb.equal(root.get("deleteAt"), 0L),
|
|
|
cb.like(root.get("name"), StringUtils.keyPattern(key))),
|
|
|
@@ -276,7 +276,7 @@ public class SlideServiceImpl implements SlideService {
|
|
|
private Page<Slide> findByCourseIdAndKeyAndStateNotIn(Long courseId, Set<SlideState> exclusiveStates, String key, Pageable pageable) {
|
|
|
return slideDAO.findAll(
|
|
|
(Specification<Slide>) (root, query, cb) -> cb.and(
|
|
|
- cb.equal(root.get("course").get("Id"), courseId),
|
|
|
+ cb.equal(root.get("course").get("id"), courseId),
|
|
|
cb.equal(root.get("deleteAt"), 0L),
|
|
|
cb.not(root.get("state").in(exclusiveStates)),
|
|
|
cb.like(root.get("name"), StringUtils.keyPattern(key))
|