renkang/zhst-finance-model
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java
This commit is contained in:
fansongsong
2025-12-19 11:16:20 +08:00
parent fcf1d0f5f4 5c7dd646a6
commit 515b231718
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java
+6 -6
View File
@@ -34,11 +34,11 @@ public class StBaseRestaurantDeptController {
@Operation(summary = "获得食堂数据", description= "获得食堂数据") @Operation(summary = "获得食堂数据", description= "获得食堂数据")
@GetMapping(value = "/getRestaurantList") @GetMapping(value = "/getRestaurantList")
public Result<?> getRestaurantList() { public Result<?> getRestaurantList() {
// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// List<ScreenVo> list = user.getCanteenIdList(); List<ScreenVo> list = user.getCanteenIdList();
// if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
// return Result.OK(list); return Result.OK(list);
// } else {//解决管理员（医生）角色，查看 营养监控 没有食堂列表问题 } else {//解决管理员（医生）角色，查看 营养监控 没有食堂列表问题
List<ScreenVo> screenVoArrayList = new ArrayList<>(); List<ScreenVo> screenVoArrayList = new ArrayList<>();
List<SlBaseRestaurant> slBaseRestaurantList = slBaseRestaurantService.list(); List<SlBaseRestaurant> slBaseRestaurantList = slBaseRestaurantService.list();
if(CollectionUtils.isNotEmpty(slBaseRestaurantList)){ if(CollectionUtils.isNotEmpty(slBaseRestaurantList)){
@@ -52,7 +52,7 @@ public class StBaseRestaurantDeptController {
}); });
} }
return Result.OK(screenVoArrayList); return Result.OK(screenVoArrayList);
// } }
} }
@Operation(summary = "获得食堂数据", description= "获得食堂数据") @Operation(summary = "获得食堂数据", description= "获得食堂数据")