From de9fbb716050414f7f3c9c31cb2ab46f5f6cb410 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 15:29:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java
index 089747c..7a1f511 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TRoleSiteController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TRoleSite;
import com.ruoyi.other.service.TRoleSiteService;
@@ -26,6 +28,11 @@
@Resource
private TRoleSiteService roleSiteService;
+ @Resource
+ private SiteClient siteClient;
+
+
+
/**
* 查询角色站点数据
* @param roleId
@@ -35,6 +42,14 @@
@PostMapping("/getSiteIds/{roleId}")
public R<List<Integer>> getSiteIds(@PathVariable Long roleId){
List<TRoleSite> list = roleSiteService.list(new LambdaQueryWrapper<TRoleSite>().eq(TRoleSite::getRoleId, roleId));
+ if(list.size() == 1){
+ Integer siteId = list.get(0).getSiteId();
+ if(0 == siteId){
+ List<Site> data = siteClient.getSiteAll().getData();
+ List<Integer> collect = data.stream().map(Site::getId).collect(Collectors.toList());
+ return R.ok(collect);
+ }
+ }
List<Integer> collect = list.stream().map(TRoleSite::getSiteId).collect(Collectors.toList());
return R.ok(collect);
}
--
Gitblit v1.7.1