From 1a0c0fc8b02415e919e17c0b6ffbf99d08dec8f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 四月 2023 17:40:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
index 09aff6d..c839d3c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRechargeRecordServiceImpl.java
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -38,7 +39,16 @@
startTime = split[0];
endTime = split[1];
}
- return tRechargeRecordMapper.userRecharge(startTime,endTime,userName,userPhone,code);
+ Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
+ Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
+ List<TRechargeRecordUserResp> userRecharge = tRechargeRecordMapper.userRecharge(startTime, endTime, userName, userPhone, code);
+ if(3 == roleType){
+ userRecharge = userRecharge.stream().filter(recharge -> recharge.getAgentId().equals(objectId)).collect(Collectors.toList());
+ }
+// if(2 == roleType){
+// userRecharge = userRecharge.stream().filter(recharge -> recharge.getBranchOfficeId().equals(objectId)).collect(Collectors.toList());
+// }
+ return userRecharge;
}
@Override
--
Gitblit v1.7.1