From 065bb297d9d33c7b181c6847e905aa063982d215 Mon Sep 17 00:00:00 2001
From: caoyiwen <caoyiwen2005@163.com>
Date: Tue, 28 Nov 2023 23:45:04 +0800
Subject: [PATCH] fix

---
 .../src/main/java/com/mathvision/diet/service/DishService.java  | 2 +-
 .../java/com/mathvision/diet/repository/MenuRepository.java     | 2 +-
 .../com/mathvision/diet/controller/MenuReleaseController.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/diet-core/src/main/java/com/mathvision/diet/service/DishService.java b/diet-core/src/main/java/com/mathvision/diet/service/DishService.java
index 841b01c..ab7d464 100644
--- a/diet-core/src/main/java/com/mathvision/diet/service/DishService.java
+++ b/diet-core/src/main/java/com/mathvision/diet/service/DishService.java
@@ -182,4 +182,4 @@ public class DishService {
             return DishLabelDO.builder().name(dish.getName()).ingredients(ingredients).component(component).build();
         }).collect(Collectors.toList());
     }
-}
+}
\ No newline at end of file
diff --git a/diet-dao/src/main/java/com/mathvision/diet/repository/MenuRepository.java b/diet-dao/src/main/java/com/mathvision/diet/repository/MenuRepository.java
index 2d42c43..5f3872c 100644
--- a/diet-dao/src/main/java/com/mathvision/diet/repository/MenuRepository.java
+++ b/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();
 }
\ No newline at end of file
diff --git a/diet-web/src/main/java/com/mathvision/diet/controller/MenuReleaseController.java b/diet-web/src/main/java/com/mathvision/diet/controller/MenuReleaseController.java
index 9b4def8..35a631a 100644
--- a/diet-web/src/main/java/com/mathvision/diet/controller/MenuReleaseController.java
+++ b/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")));
     }
 }