From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index c079129..4c2f434 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -238,11 +238,13 @@
roleSiteClient.delRoleSite(dto.getRoleId());
//添加站点权限
List<TRoleSite> roleSites = new ArrayList<>();
- for (Integer siteId : dto.getSiteIds()) {
- TRoleSite roleSite = new TRoleSite();
- roleSite.setRoleId(role.getRoleId().intValue());
- roleSite.setSiteId(siteId);
- roleSites.add(roleSite);
+ if(null != dto.getSiteIds()){
+ for (Integer siteId : dto.getSiteIds()) {
+ TRoleSite roleSite = new TRoleSite();
+ roleSite.setRoleId(role.getRoleId().intValue());
+ roleSite.setSiteId(siteId);
+ roleSites.add(roleSite);
+ }
}
roleSiteClient.addRoleSite(roleSites);
return AjaxResult.success();
--
Gitblit v1.7.1