From 8608d56a4605d63452fbff36420dae48dd88779d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 21 八月 2024 17:02:17 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index dc848a4..ad0660a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -174,6 +174,9 @@
public AjaxResult<List<String>> getRoleSiteName(@PathVariable Integer roleId){
List<Integer> ids = roleSiteClient.getSiteIds(roleId.longValue()).getData();
List<Site> data = siteClient.getSiteByIds(ids).getData();
+ if(null == data){
+ return AjaxResult.success(new ArrayList<>());
+ }
List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());
return AjaxResult.success(siteNames);
}
--
Gitblit v1.7.1