森林防火
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
2024-07-30 90746aae01216e955a5afacc99f17c5eb0563552 
 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;


@@ -100,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);


    }