From d47f6d80fcd0ccb279a27fd80c3bd45775fc2eed Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 07 二月 2025 11:19:49 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 389db9f..86924f1 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
@@ -22,6 +22,7 @@
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
+import org.springframework.util.CollectionUtils;
/**
* 角色 业务层处理
@@ -558,6 +559,7 @@
SysRole sysRole = new SysRole();
sysRole.setRoleName(dto.getRoleName());
sysRole.setPostType(dto.getPostType());
+ sysRole.setRemark(dto.getRemark());
roleMapper.insertRole(sysRole);
// 添加角色权限中间表
@@ -573,9 +575,9 @@
}
@Override
- public PageInfo<SysRole> selectList(SysRoleQuery query) {
+ public PageInfo<SysRole> selectPageList(SysRoleQuery query) {
PageInfo<SysRole> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<SysRole> list = roleMapper.selectList(query,pageInfo);
+ List<SysRole> list = roleMapper.selectPageList(query,pageInfo);
pageInfo.setRecords(list);
return pageInfo;
}
@@ -587,6 +589,7 @@
sysRole.setRoleId(dto.getRoleId());
sysRole.setRoleName(dto.getRoleName());
sysRole.setPostType(dto.getPostType());
+ sysRole.setRemark(dto.getRemark());
roleMapper.updateRole(sysRole);
// 删除角色与菜单关联
roleMenuMapper.deleteRoleMenuByRoleId(dto.getRoleId());
--
Gitblit v1.7.1