From 7221f94146162703991df36995b9e3ca50402ff1 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 11 七月 2025 21:23:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 0da33c7..3d3f218 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -4,6 +4,7 @@ import java.util.stream.Collectors; import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.system.dto.SysRoleDTO; import com.ruoyi.system.mapper.*; @@ -560,6 +561,7 @@ sysRole.setRoleName(dto.getRoleName()); sysRole.setPostType(dto.getPostType()); sysRole.setRemark(dto.getRemark()); + sysRole.setRoleType(dto.getRoleType()); roleMapper.insertRole(sysRole); // 添加角色权限中间表 @@ -591,6 +593,7 @@ sysRole.setPostType(dto.getPostType()); sysRole.setRoleType(dto.getRoleType()); sysRole.setRemark(dto.getRemark()); + sysRole.setRoleType(dto.getRoleType()); roleMapper.updateRole(sysRole); // 删除角色与菜单关联 roleMenuMapper.deleteRoleMenuByRoleId(dto.getRoleId()); -- Gitblit v1.7.1