From 960380f89c9371ba309d6c50b1ab1b677ea74575 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 20:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index 4ceeab6..1d60a46 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -80,13 +80,8 @@
@GetMapping("/map/getSiteList")
@ApiOperation(value = "获取站点", tags = {"2.0-管理后台-数据分析-电站分布"})
public R<List<GetSiteListDTO>> getMapSiteList(GetSiteList siteList){
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser data = sysUserClient.getSysUser(userid).getData();
-
- if (data.getRoleType()==2){
- siteList.setSiteId(data.getSiteId());
- }
- List<GetSiteListDTO> list = siteService.getSiteListNolimit(siteList);
+ SysUser sysUser = tokenService.getLoginUser().getSysUser();
+ List<GetSiteListDTO> list = siteService.getSiteListNolimit(siteList,sysUser);
List<GetSiteListDTO> records = list;
for (GetSiteListDTO record : records) {
--
Gitblit v1.7.1