From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index fcd0fdc..baf35a3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -27,7 +27,6 @@
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserRoleService;
import com.ruoyi.system.service.ISysUserService;
-import io.seata.common.util.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -41,6 +40,7 @@
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -83,7 +83,8 @@
// @ApiOperation("获取所有角色信息根据公司id")
@GetMapping("/list")
- public AjaxResult list(Integer companyId)
+ @ApiOperation("获取不分页角色列表")
+ public AjaxResult list()
{
SysRole role = new SysRole();
List<SysRole> list = roleService.selectRoleList(role);
@@ -91,7 +92,7 @@
}
- @ApiOperation("获取角色列表")
+ @ApiOperation("获取分页角色列表")
@PostMapping("/listPage")
public AjaxResult listPage(@Validated @RequestBody RoleQuery query)
{
@@ -99,7 +100,7 @@
PageInfo<SysRole> page = roleService.page(pageInfo,
new LambdaQueryWrapper<SysRole>().ne(SysRole::getRoleId, 20)
- .like(StringUtils.isNotBlank(query.getRoleName()), SysRole::getRoleName,
+ .like(StringUtils.hasLength(query.getRoleName()), SysRole::getRoleName,
query.getRoleName()).eq(SysRole::getDelFlag, "0"));
return AjaxResult.success(page);
}
@@ -135,7 +136,7 @@
if(CollectionUtils.isEmpty(menuIds1)){
return AjaxResult.error("菜单id不能为空");
}
- role.setMenuIds(dto.getMenuIds().toArray(new Long[0]));
+ role.setMenuIds(dto.getMenuIds().toArray((new Long[dto.getMenuIds().size()])));
// 添加角色
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
--
Gitblit v1.7.1