From 3dd961dbdcee7cde4c42de6ed738563ce30d5bbb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 26 八月 2025 15:15:23 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index e1a2413..102d18f 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -14,6 +14,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.system.api.domain.SysUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -48,8 +49,12 @@
 	 * @return
 	 */
 	@Override
-	public PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page) {
-		Set<Integer> siteIds = null;
+	public PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page, SysUser sysUser) {
+		// 获取当前登录账号站点
+		Set<Integer> siteIds = new HashSet<>();
+		if(sysUser.getRoleType() != 1){
+			siteIds.add(sysUser.getSiteId());
+		}
 		PageInfo<PageChargingPileListDTO> pageInfo = new PageInfo<>(page.getPageCurr(), page.getPageSize());
 		List<PageChargingPileListDTO> list = this.baseMapper.pageChargingPileList(pageInfo, page, siteIds);
 		return pageInfo.setRecords(list);
@@ -97,9 +102,6 @@
 		}
 		if(null == chargingPile.getSiteId()){
 			return AjaxResult.error("归属电站不能为空");
-		}
-		if(null == chargingPile.getPartnerId()){
-			return AjaxResult.error("归属合作商不能为空");
 		}
 		if(null == chargingPile.getRatedPower()){
 			return AjaxResult.error("额定功率不能为空");

--
Gitblit v1.7.1