caoyiwen 1 year ago
parent
commit
065bb297d9
  1. 2
      diet-dao/src/main/java/com/mathvision/diet/repository/MenuRepository.java
  2. 2
      diet-web/src/main/java/com/mathvision/diet/controller/MenuReleaseController.java

2
diet-dao/src/main/java/com/mathvision/diet/repository/MenuRepository.java

@ -49,6 +49,6 @@ public interface MenuRepository extends JpaRepository<Menu, Long>, JpaSpecificat
@Transactional
@Modifying
@Query(value = "update menu v set v.status = 2 where v.status = 5 and v.end_time < now()", nativeQuery = true)
@Query(value = "update menu v set v.status = 0 where v.status = 5 and v.end_time < now()", nativeQuery = true)
void scanExpired();
}

2
diet-web/src/main/java/com/mathvision/diet/controller/MenuReleaseController.java

@ -51,7 +51,7 @@ public class MenuReleaseController extends BaseController {
@ResponseBody
@RequestMapping(method = RequestMethod.GET)
public Page<Menu> query(@RequestParam(required = false) String name, @RequestParam(required = false) Long vender, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false, defaultValue = "0") int pageNo, @RequestParam(required = false, defaultValue = "20") int pageSize) {
return menuReleaseService.list(vender, name, parseDate(startTime), parseDate(endTime), PageRequest.of(pageNo, pageSize).withSort(Sort.by(Sort.Direction.DESC, "id")));
return menuReleaseService.list(isAdmin() ? vender : getVender(), name, parseDate(startTime), parseDate(endTime), PageRequest.of(pageNo, pageSize).withSort(Sort.by(Sort.Direction.DESC, "id")));
}
}

Loading…
Cancel
Save