From a939ff4f4bb69f9191828ec961609e33b75fe5a5 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Mon, 15 Dec 2025 09:10:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=89=B4=E6=9D=83=E7=9B=B8=E5=85=B3=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StBbzxOrderInfoController.java | 80 +++++++++---------- .../impl/StBbzxOrderInfoServiceImpl.java | 48 +++++------ .../StBaseRestaurantDeptController.java | 12 +-- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java index 5f44436..d8ccdb3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java @@ -294,18 +294,18 @@ public class StBbzxOrderInfoController { } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //餐品总库只查询内置食堂 -// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ -// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -//// ScreenVo screenVo = new ScreenVo(); -//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -//// canteenIdList.add(screenVo); -// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { -// //查询当前登录用户的食堂列表 -// String canteenId = sysUser.getCanteenId(); -// query.setCanteenId(canteenId); -// } else { -// return Result.OK(); -// } + if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ + // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +// ScreenVo screenVo = new ScreenVo(); +// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +// canteenIdList.add(screenVo); + } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { + //查询当前登录用户的食堂列表 + String canteenId = sysUser.getCanteenId(); + query.setCanteenId(canteenId); + } else { + return Result.OK(); + } query.setStatus(3);//(充值=102 return Result.OK(iStClientMemberTransactionRecordService.pageQuery(query)); } @@ -323,20 +323,20 @@ public class StBbzxOrderInfoController { query.setStartTime(split[0]); query.setEndTime(split[1]); } -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// //餐品总库只查询内置食堂 -// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ -// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -//// ScreenVo screenVo = new ScreenVo(); -//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -//// canteenIdList.add(screenVo); -// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { -// //查询当前登录用户的食堂列表 -// String canteenId = sysUser.getCanteenId(); -// query.setCanteenId(canteenId); -// } else { -// return Result.OK(); -// } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //餐品总库只查询内置食堂 + if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ + // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +// ScreenVo screenVo = new ScreenVo(); +// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +// canteenIdList.add(screenVo); + } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { + //查询当前登录用户的食堂列表 + String canteenId = sysUser.getCanteenId(); + query.setCanteenId(canteenId); + } else { + return Result.OK(); + } query.setStatus(3);//(充值=102 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class); @@ -358,20 +358,20 @@ public class StBbzxOrderInfoController { query.setStartTime(split[0]); query.setEndTime(split[1]); } -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// //餐品总库只查询内置食堂 -// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ -// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -//// ScreenVo screenVo = new ScreenVo(); -//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -//// canteenIdList.add(screenVo); -// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { -// //查询当前登录用户的食堂列表 -// String canteenId = sysUser.getCanteenId(); -// query.setCanteenId(canteenId); -// } else { -// return; -// } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //餐品总库只查询内置食堂 + if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ + // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +// ScreenVo screenVo = new ScreenVo(); +// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +// canteenIdList.add(screenVo); + } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { + //查询当前登录用户的食堂列表 + String canteenId = sysUser.getCanteenId(); + query.setCanteenId(canteenId); + } else { + return; + } query.setStatus(3);//(充值=102 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(statisticsCanteenBusiness)){ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java index 44409a8..e1fc975 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java @@ -445,15 +445,15 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl canteenIds = new ArrayList<>(); -// if(StringUtils.isEmpty(canteenId)){ -// if(sysUser != null){ -// canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); -// } -// }else { + if(StringUtils.isEmpty(canteenId)){ + if(sysUser != null){ + canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); + } + }else { canteenIds = Collections.singletonList(canteenId); -// } + } //获取数据列表 List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpent(canteenIds, startDate, endDate); if(CollectionUtils.isEmpty(statisticsTheAmountSpentVos)){ @@ -505,15 +505,15 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl canteenIds = new ArrayList<>(); -// if(StringUtils.isEmpty(canteenId)){ -// if(sysUser != null){ -// canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); -// } -// }else { + if(StringUtils.isEmpty(canteenId)){ + if(sysUser != null){ + canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); + } + }else { canteenIds = Collections.singletonList(canteenId); -// } + } //获取数据列表 List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpent(canteenIds, startDate, endDate); if(CollectionUtils.isEmpty(statisticsTheAmountSpentVos)){ @@ -577,16 +577,16 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl canteenIds = new ArrayList<>(); -// if(StringUtils.isEmpty(canteenId)){ -// if(sysUser != null){ -// canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); -// } -// }else { -// canteenIds = Collections.singletonList(canteenId); -// } - List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpentEveryMember(null,name,payName,startDate, endDate, secondDepartId, thirdDepartId); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List canteenIds = new ArrayList<>(); + if(StringUtils.isEmpty(canteenId)){ + if(sysUser != null){ + canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); + } + }else { + canteenIds = Collections.singletonList(canteenId); + } + List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpentEveryMember(canteenIds,name,payName,startDate, endDate, secondDepartId, thirdDepartId); if(CollectionUtils.isEmpty(statisticsTheAmountSpentVos)){ return new Page<>(); } 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= "获得食堂数据")