From 2dfb69e49f46d5bed89197a40c526abae5ee7315 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 21:27:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 9 +++++++++
1 files changed, 9 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 a310cf7..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);
// 添加角色权限中间表
@@ -589,7 +591,9 @@
sysRole.setRoleId(dto.getRoleId());
sysRole.setRoleName(dto.getRoleName());
sysRole.setPostType(dto.getPostType());
+ sysRole.setRoleType(dto.getRoleType());
sysRole.setRemark(dto.getRemark());
+ sysRole.setRoleType(dto.getRoleType());
roleMapper.updateRole(sysRole);
// 删除角色与菜单关联
roleMenuMapper.deleteRoleMenuByRoleId(dto.getRoleId());
@@ -611,4 +615,9 @@
public List<SysRole> selectRoleByUserIds(List<String> roleIds) {
return roleMapper.selectRoleByUserIds(roleIds);
}
+
+ @Override
+ public List<SysRole> listNotPageByTemplateId(String templateId) {
+ return roleMapper.listNotPageByTemplateId(templateId);
+ }
}
--
Gitblit v1.7.1