From ef5dda6db97f89c09a714b9304f302c00ee4ac6c Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期二, 16 一月 2024 13:53:07 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/service/impl/RolePermissionServiceImpl.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/impl/RolePermissionServiceImpl.java b/springboot-vue3/src/main/java/com/example/springboot/service/impl/RolePermissionServiceImpl.java index b6abbeb..3648bc8 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/service/impl/RolePermissionServiceImpl.java +++ b/springboot-vue3/src/main/java/com/example/springboot/service/impl/RolePermissionServiceImpl.java @@ -1,12 +1,15 @@ package com.example.springboot.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.example.springboot.entity.MenuList; import com.example.springboot.service.PermissionService; import com.example.springboot.mapper.RolePermissionMapper; import com.example.springboot.entity.RolePermission; import com.example.springboot.entity.vo.RolePermissionVo; + import com.example.springboot.service.RolePermissionService; import com.example.springboot.service.RoleService; import lombok.extern.slf4j.Slf4j; @@ -22,14 +25,19 @@ private PermissionService permissionService; @Override + public IPage<RolePermission> selectPage(RolePermissionVo rolePermissionVO) { IPage<RolePermission> rolePermissionIPage = lambdaQuery() .orderByAsc(RolePermission::getRoleId) + .like(StrUtil.isNotBlank(rolePermissionVO.getName()), RolePermission::getName, rolePermissionVO.getName()) .page(new Page<>(rolePermissionVO.getPageNum(), rolePermissionVO.getPageSize())); + rolePermissionIPage.getRecords().forEach(rolePermission -> { rolePermission.setRole(roleService.getById(rolePermission.getRoleId())); rolePermission.setPermission(permissionService.getById(rolePermission.getPermissionId())); }); + return rolePermissionIPage; } + } -- Gitblit v1.8.0