From 34e224c92280107be94f962cb29c44e902bafbcb Mon Sep 17 00:00:00 2001
From: OpenCode <opencode@vben.dev>
Date: Fri, 10 Jul 2026 10:44:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E5=92=8C=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=B7=BB=E5=8A=A0=E5=90=AF=E7=94=A8/=E5=81=9C?=
 =?UTF-8?q?=E7=94=A8=E7=8A=B6=E6=80=81=EF=BC=8C=E5=81=9C=E7=94=A8=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E4=B8=8D=E5=8F=82=E4=B8=8E=E6=9D=83=E9=99=90=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/entity/sys/BaseSysDepartmentEntity.java      |  4 +++-
 .../modules/base/entity/sys/BaseSysRoleEntity.java    |  3 +++
 .../service/sys/impl/BaseSysPermsServiceImpl.java     | 11 ++++++++++-
 .../base/service/sys/impl/BaseSysRoleServiceImpl.java |  3 +++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/cool/modules/base/entity/sys/BaseSysDepartmentEntity.java b/src/main/java/com/cool/modules/base/entity/sys/BaseSysDepartmentEntity.java
index 406079b..02bf5c0 100644
--- a/src/main/java/com/cool/modules/base/entity/sys/BaseSysDepartmentEntity.java
+++ b/src/main/java/com/cool/modules/base/entity/sys/BaseSysDepartmentEntity.java
@@ -24,7 +24,9 @@ public class BaseSysDepartmentEntity extends BaseEntity<BaseSysDepartmentEntity>
     @ColumnDefine(comment = "排序", defaultValue = "0")
     private Integer orderNum;
 
-    // 父菜单名称
+    @ColumnDefine(comment = "状态 0:禁用 1:启用", defaultValue = "1")
+    private Integer status;
+
     @Column(ignore = true)
     private String parentName;
 }
diff --git a/src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleEntity.java b/src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleEntity.java
index be0ba82..e49cb04 100644
--- a/src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleEntity.java
+++ b/src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleEntity.java
@@ -30,6 +30,9 @@ public class BaseSysRoleEntity extends BaseEntity<BaseSysRoleEntity> {
     @ColumnDefine(comment = "备注")
     private String remark;
 
+    @ColumnDefine(comment = "状态 0:禁用 1:启用", defaultValue = "1")
+    private Integer status;
+
     @ColumnDefine(comment = "数据权限是否关联上下级", defaultValue = "1")
     private Integer relevance;
 
diff --git a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java
index 144bd84..1240d97 100644
--- a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java
+++ b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysPermsServiceImpl.java
@@ -38,6 +38,8 @@ public class BaseSysPermsServiceImpl implements BaseSysPermsService {
 
     final private BaseSysRoleMenuMapper baseSysRoleMenuMapper;
 
+    final private BaseSysRoleMapper baseSysRoleMapper;
+
     final private BaseSysRoleDepartmentMapper baseSysRoleDepartmentMapper;
 
     final private BaseSysDepartmentMapper baseSysDepartmentMapper;
@@ -114,7 +116,14 @@ public class BaseSysPermsServiceImpl implements BaseSysPermsService {
         if (!userEntity.getUsername().equals("admin")) {
             List<BaseSysUserRoleEntity> list = baseSysUserRoleMapper
                 .selectListByQuery(QueryWrapper.create().eq(BaseSysUserRoleEntity::getUserId, userEntity.getId()));
-            roleIds = list.stream().map(BaseSysUserRoleEntity::getRoleId).toArray(Long[]::new);
+            List<Long> activeRoleIds = new ArrayList<>();
+            for (BaseSysUserRoleEntity userRole : list) {
+                BaseSysRoleEntity role = baseSysRoleMapper.selectOneById(userRole.getRoleId());
+                if (role != null && role.getStatus() != 0) {
+                    activeRoleIds.add(userRole.getRoleId());
+                }
+            }
+            roleIds = activeRoleIds.toArray(Long[]::new);
             if (Arrays.asList(roleIds).contains(1L)) {
                 roleIds = null;
             }
diff --git a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysRoleServiceImpl.java b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysRoleServiceImpl.java
index 159ae97..0f79977 100644
--- a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysRoleServiceImpl.java
+++ b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysRoleServiceImpl.java
@@ -82,6 +82,9 @@ public class BaseSysRoleServiceImpl extends BaseServiceImpl<BaseSysRoleMapper, B
         } else {
             baseSysPermsService.updatePerms(baseSysRoleEntity.getId(), requestParams.get("menuIdList", Long[].class),
                     requestParams.get("departmentIdList", Long[].class));
+            if (baseSysRoleEntity.getStatus() != null && baseSysRoleEntity.getStatus() == 0) {
+                baseSysPermsService.refreshPermsByRoleId(baseSysRoleEntity.getId());
+            }
         }
     }