流水明细相关鉴权回滚
This commit is contained in:
+32
-32
@@ -435,10 +435,10 @@ public class StClientMemberBalanceController {
|
|||||||
query.setStartTime(query.getDates().get(0));
|
query.setStartTime(query.getDates().get(0));
|
||||||
query.setEndTime(query.getDates().get(1));
|
query.setEndTime(query.getDates().get(1));
|
||||||
}
|
}
|
||||||
//余: 去掉鉴权, 要能看到所有的
|
|
||||||
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
// String canteenId = sysUser.getCanteenId();
|
String canteenId = sysUser.getCanteenId();
|
||||||
// query.setCanteenId(canteenId);
|
query.setCanteenId(canteenId);
|
||||||
//消费=101
|
//消费=101
|
||||||
query.setStatus(101);
|
query.setStatus(101);
|
||||||
return Result.OK(iStClientMemberTransactionRecordService.pageQueryNew(query));
|
return Result.OK(iStClientMemberTransactionRecordService.pageQueryNew(query));
|
||||||
@@ -457,20 +457,20 @@ public class StClientMemberBalanceController {
|
|||||||
query.setStartTime(split[0]);
|
query.setStartTime(split[0]);
|
||||||
query.setEndTime(split[1]);
|
query.setEndTime(split[1]);
|
||||||
}
|
}
|
||||||
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
// //餐品总库只查询内置食堂
|
//餐品总库只查询内置食堂
|
||||||
// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
|
if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
|
||||||
// // 后期分数据权限时在解开注释,此处管理员账户能看到所有食堂数据
|
// 后期分数据权限时在解开注释,此处管理员账户能看到所有食堂数据
|
||||||
//// ScreenVo screenVo = new ScreenVo();
|
// ScreenVo screenVo = new ScreenVo();
|
||||||
//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
|
// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
|
||||||
//// canteenIdList.add(screenVo);
|
// canteenIdList.add(screenVo);
|
||||||
// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
|
} else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
|
||||||
// //查询当前登录用户的食堂列表
|
//查询当前登录用户的食堂列表
|
||||||
// String canteenId = sysUser.getCanteenId();
|
String canteenId = sysUser.getCanteenId();
|
||||||
// query.setCanteenId(canteenId);
|
query.setCanteenId(canteenId);
|
||||||
// } else {
|
} else {
|
||||||
// return Result.OK();
|
return Result.OK();
|
||||||
// }
|
}
|
||||||
query.setStatus(1);//消费=101
|
query.setStatus(1);//消费=101
|
||||||
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
|
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
|
||||||
StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
|
StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
|
||||||
@@ -497,20 +497,20 @@ public class StClientMemberBalanceController {
|
|||||||
if(StringUtils.isNotBlank(query.getEndDate())){
|
if(StringUtils.isNotBlank(query.getEndDate())){
|
||||||
query.setEndTime(query.getEndDate());
|
query.setEndTime(query.getEndDate());
|
||||||
}
|
}
|
||||||
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
// //餐品总库只查询内置食堂
|
//餐品总库只查询内置食堂
|
||||||
// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
|
if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){
|
||||||
// // 后期分数据权限时在解开注释,此处管理员账户能看到所有食堂数据
|
// 后期分数据权限时在解开注释,此处管理员账户能看到所有食堂数据
|
||||||
//// ScreenVo screenVo = new ScreenVo();
|
// ScreenVo screenVo = new ScreenVo();
|
||||||
//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
|
// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID);
|
||||||
//// canteenIdList.add(screenVo);
|
// canteenIdList.add(screenVo);
|
||||||
// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
|
} else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) {
|
||||||
// //查询当前登录用户的食堂列表
|
//查询当前登录用户的食堂列表
|
||||||
// String canteenId = sysUser.getCanteenId();
|
String canteenId = sysUser.getCanteenId();
|
||||||
// query.setCanteenId(canteenId);
|
query.setCanteenId(canteenId);
|
||||||
// } else {
|
} else {
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
query.setStatus(1);//消费=101
|
query.setStatus(1);//消费=101
|
||||||
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
|
List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user