From 4bf9185195316791f0339af501f12d97d8519c2c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 11:52:47 +0800
Subject: [PATCH] 修改计费bug

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
index 06c435a..cf8eeb4 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java
@@ -10,6 +10,7 @@
 import com.ruoyi.chargingPile.mapper.TFaultMessageMapper;
 import com.ruoyi.chargingPile.service.*;
 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.other.api.feignClient.RoleSiteClient;
 import com.ruoyi.other.api.feignClient.UserSiteClient;
@@ -38,7 +39,8 @@
 @Slf4j
 @Service
 public class TFaultMessageServiceImpl extends ServiceImpl<TFaultMessageMapper, TFaultMessage> implements TFaultMessageService {
-
+    @Resource
+    private TokenService tokenService;
     @Autowired
     private ISiteService siteService;
     @Autowired
@@ -107,7 +109,7 @@
                 siteIds = new ArrayList<>(data);
             }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