From d4fa4dd26808831243486326db714fd4137d53b6 Mon Sep 17 00:00:00 2001
From: stylefeng <sn93@qq.com>
Date: Wed, 22 Jan 2025 23:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90role=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RoleCategoryServiceImpl.java | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java
index beed9ed4c..44c8701c2 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -73,10 +74,25 @@ public class RoleCategoryServiceImpl extends ServiceImpl<RoleCategoryMapper, Rol
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void edit(RoleCategoryRequest roleCategoryRequest) {
-        RoleCategory roleCategory = this.queryRoleCategory(roleCategoryRequest);
-        BeanUtil.copyProperties(roleCategoryRequest, roleCategory);
-        this.updateById(roleCategory);
+        RoleCategory oldCategory = this.queryRoleCategory(roleCategoryRequest);
+
+        RoleCategory newRoleCategory = new RoleCategory();
+        BeanUtil.copyProperties(oldCategory, newRoleCategory);
+        BeanUtil.copyProperties(roleCategoryRequest, newRoleCategory);
+
+        // 如果改了层级结构，则递归更新子结构
+        if (!oldCategory.getCategoryParentId().equals(newRoleCategory.getCategoryParentId())) {
+
+            // 设置文件夹的pids集合
+            CalcParentIdListUtil.fillParentIds(newRoleCategory, this);
+
+            // 更新文件夹的上下级结构
+            CalcParentIdListUtil.updateParentIdStringList("sys_role_category", "category_pids", oldCategory, newRoleCategory, this);
+        }
+
+        this.updateById(oldCategory);
     }
 
     @Override