From ea51f27ee3ea46d2d2259516c49e00197ba0b399 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 十二月 2024 16:43:30 +0800
Subject: [PATCH] 合作商权限
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
index 2e57619..0e4c450 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java
@@ -103,11 +103,6 @@
}
Long userId = tokenService.getLoginUser().getUserid();
List<Integer> siteIds = new ArrayList<>();
-
- if (dto.getType() == 1){
- siteIds.add(0);
- dto.setSiteIds(siteIds);
- }else{
//如果没传siteId,获取当前登陆人所有的siteIds
if (dto.getSiteId()==null){
if (userId != null){
@@ -123,7 +118,7 @@
siteIds.add(-1);
}
dto.setSiteIds(siteIds);
- }
+
PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
PageInfo<ChargingBillListVO> pageInfo1 = new PageInfo<>(1,9999999);
@@ -147,6 +142,9 @@
if (roleType==2){
Boolean data = partnerClient.getAccountMenu(sysUser.getObjectId(), chargingBillListVO.getSiteId()).getData();
chargingBillListVO.setAuthDownLoad(data);
+ if (chargingBillListVO.getType()==1){
+ continue;
+ }
}
String temp = "";
String temp1 = "";
@@ -389,7 +387,10 @@
BigDecimal bigDecimal = new BigDecimal("0");
int i = 0;
for (ChargingBillListVO chargingBillListVO : list1) {
- if (!siteIds.contains(chargingBillListVO.getSiteId())){
+ if (chargingBillListVO.getSiteId()!=0&&!siteIds.contains(chargingBillListVO.getSiteId())){
+ continue;
+ }
+ if (chargingBillListVO.getType()==1){
continue;
}
i++;
--
Gitblit v1.7.1