From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb

---
 oying-system/src/main/java/com/oying/modules/system/service/impl/RoleServiceImpl.java |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/RoleServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/RoleServiceImpl.java
index 91b8820..307b89b 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/RoleServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/RoleServiceImpl.java
@@ -79,9 +79,6 @@
         }
         save(resources);
         // 判断是否有机构数据,若有,则需创建关联
-        if (CollectionUtil.isNotEmpty(resources.getDepts())) {
-            roleDeptMapper.insertData(resources.getId(), resources.getDepts());
-        }
     }
 
     @Override
@@ -95,16 +92,13 @@
         role.setName(resources.getName());
         role.setDescription(resources.getDescription());
         role.setDataScope(resources.getDataScope());
-        role.setDepts(resources.getDepts());
         role.setLevel(resources.getLevel());
         // 更新
         saveOrUpdate(role);
         // 删除关联机构数据
         roleDeptMapper.deleteByRoleId(resources.getId());
         // 判断是否有机构数据,若有,则需更新关联
-        if (CollectionUtil.isNotEmpty(resources.getDepts())) {
-            roleDeptMapper.insertData(resources.getId(), resources.getDepts());
-        }
+
         // 更新相关缓存
         delCaches(role.getId(), null);
     }

--
Gitblit v1.9.3