diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java index 7c9541d..0ea0f3c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java @@ -34,11 +34,11 @@ public class StBaseRestaurantDeptController { @Operation(summary = "获得食堂数据", description= "获得食堂数据") @GetMapping(value = "/getRestaurantList") public Result getRestaurantList() { -// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// List list = user.getCanteenIdList(); -// if(CollectionUtils.isNotEmpty(list)){ -// return Result.OK(list); -// } else {//解决管理员(医生)角色,查看 营养监控 没有食堂列表问题 + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List list = user.getCanteenIdList(); + if(CollectionUtils.isNotEmpty(list)){ + return Result.OK(list); + } else {//解决管理员(医生)角色,查看 营养监控 没有食堂列表问题 List screenVoArrayList = new ArrayList<>(); List slBaseRestaurantList = slBaseRestaurantService.list(); if(CollectionUtils.isNotEmpty(slBaseRestaurantList)){ @@ -52,7 +52,7 @@ public class StBaseRestaurantDeptController { }); } return Result.OK(screenVoArrayList); -// } + } } @Operation(summary = "获得食堂数据", description= "获得食堂数据")