From 69b10ab2a3e171e6f30091ee54d8957cf4987809 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 10:54:43 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 2eace47..52100ba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -9,8 +9,9 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.dto.SysRoleDTO;
+import com.ruoyi.system.model.TTemplate;
import com.ruoyi.system.query.SysRoleQuery;
-import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.system.RoleInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,9 +32,6 @@
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
/**
* 角色信息
@@ -61,6 +59,8 @@
private ISysDeptService deptService;
@Autowired
private ISysMenuService menuService;
+ @Autowired
+ private TTemplateService templateService;
@PreAuthorize("@ss.hasPermi('system:role')")
@ApiOperation(value = "角色列表")
@@ -78,6 +78,16 @@
{
List<SysRole> list = roleService.selectRoleList(new SysRole());
return AjaxResult.success(list);
+ }
+ @ApiOperation(value = "角色列表不分页根据模板id")
+ @GetMapping("/listNotPageByTemplateId")
+ public AjaxResult listNotPageByTemplateId(@RequestParam String templateId)
+ {
+ TTemplate byId = templateService.getById(templateId);
+ SysRole sysRole = roleService.selectRoleById(byId.getRoleId());
+ List<SysRole> sysRoles = new ArrayList<>();
+ sysRoles.add(sysRole);
+ return AjaxResult.success(sysRoles);
}
@PreAuthorize("@ss.hasPermi('system:role:count')")
@ApiOperation(value = "角色数量统计")
@@ -125,6 +135,7 @@
RoleInfoVO roleInfoVo = new RoleInfoVO();
roleInfoVo.setRoleId(role.getRoleId());
roleInfoVo.setRoleName(role.getRoleName());
+ roleInfoVo.setRemark(role.getRemark());
// 获取当前角色的菜单列表
List<SysMenu> menus = menuService.selectListByRoleId(roleId);
--
Gitblit v1.7.1