From 26cd0115150771d66a6cfca9c03820a734b69c9f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 十二月 2024 19:19:38 +0800
Subject: [PATCH] 合作商权限

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index 2666ac1..9152d4b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -24,6 +24,7 @@
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.integration.api.feignClient.SendMessageClient;
 import com.ruoyi.integration.api.model.QrCodeDelivery;
@@ -76,13 +77,14 @@
     private SiteClient siteClient;
 
 
-    
+    @Resource
+    private TokenService tokenService;
     
     @Override
     public PageInfo<TChargingGunVO> pageList(TChargingGunQuery query) {
         Set<Integer> siteIds = null;
         //校验合作商权限
-        SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+        SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
         Integer roleType = sysUser.getRoleType();
         Integer objectId = sysUser.getObjectId();
         //合作商
@@ -90,7 +92,7 @@
             siteIds = partnerService.authSite(objectId, SiteMenu.CHARGING_GUN);
         }else{
             //非管理员需要根据角色和用户配置查询允许的站点数据
-            if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+            if(!SecurityUtils.isAdmin(tokenService.getLoginUser().getUserid())){
                 List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
                 List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
                 List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();

--
Gitblit v1.7.1