From 653cb0ed3e7be231059480cee266b11f1c9ba11e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 七月 2025 11:52:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 52100ba..767d5fc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -86,7 +86,10 @@
TTemplate byId = templateService.getById(templateId);
SysRole sysRole = roleService.selectRoleById(byId.getRoleId());
List<SysRole> sysRoles = new ArrayList<>();
- sysRoles.add(sysRole);
+ if (sysRole!=null){
+ sysRoles.add(sysRole);
+
+ }
return AjaxResult.success(sysRoles);
}
@PreAuthorize("@ss.hasPermi('system:role:count')")
--
Gitblit v1.7.1