From 245f6bd6438db3c099fcbbfbf1310d698f67a68a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 11 九月 2024 10:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
index 110ef9c..3e2ee4b 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
@@ -22,7 +22,9 @@
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.feignClient.SysRoleClient;
 import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.feignClient.SysUserRoleClient;
 import com.ruoyi.system.api.model.GetSysRoleByIds;
+import com.ruoyi.system.api.model.SysUserRoleVo;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
@@ -62,6 +64,9 @@
 	
 	@Resource
 	private RoleSiteClient roleSiteClient;
+
+	@Resource
+	private SysUserRoleClient userRoleClient;
 	
 	
 	
@@ -410,7 +415,8 @@
 		Partner partner = this.getById(partnerId);
 		SysUser sysUser = sysUserClient.queryUserByUserName(partner.getAccount()).getData();
 		List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
-		List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+		List<SysUserRoleVo> data2 = userRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+		List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
 		collect.addAll(data);
 		collect.addAll(data1);
 		Set<Integer> siteIds = new HashSet<>(collect);

--
Gitblit v1.7.1