From 8763fd66e6b7bc3ef4dd3d7ea220437f05776f80 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Fri, 12 Dec 2025 12:06:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E6=98=8E=E7=BB=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=89=B4=E6=9D=83=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StClientMemberBalanceController.java | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java index 1f06e48..ce92d3e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java @@ -435,10 +435,10 @@ public class StClientMemberBalanceController { query.setStartTime(query.getDates().get(0)); query.setEndTime(query.getDates().get(1)); } - //余: 去掉鉴权, 要能看到所有的 -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// String canteenId = sysUser.getCanteenId(); -// query.setCanteenId(canteenId); + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String canteenId = sysUser.getCanteenId(); + query.setCanteenId(canteenId); //消费=101 query.setStatus(101); return Result.OK(iStClientMemberTransactionRecordService.pageQueryNew(query)); @@ -457,20 +457,20 @@ public class StClientMemberBalanceController { 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(1);//消费=101 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class); @@ -497,20 +497,20 @@ public class StClientMemberBalanceController { if(StringUtils.isNotBlank(query.getEndDate())){ query.setEndTime(query.getEndDate()); } -// 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(1);//消费=101 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);