From 324ed9fac852bc4117ee0da65a586adef258bd52 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 11:08:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 e85ee70..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()==3){
- 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) {
@@ -333,8 +328,8 @@
@PostMapping("/editSite")
@ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"})
@Log(title = "【站点管理】编辑站点", businessType = BusinessType.UPDATE)
- public AjaxResult editSite(@RequestBody Site site){
- return siteService.editSite(site);
+ public AjaxResult editSite(@RequestBody SiteDTO dto){
+ return siteService.editSite(dto);
}
@ResponseBody
--
Gitblit v1.7.1