From 91ce812225f3bb10550abac6098e1b7f1345c58e Mon Sep 17 00:00:00 2001 From: Yjoioooo <693337446@qq.com> Date: Mon, 27 Mar 2023 11:40:28 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=9F=E4=B8=80=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SysOssConfigController.java | 14 ++--- .../controller/system/SysOssController.java | 12 ++-- .../system/SysProfileController.java | 4 +- .../system/SysTenantController.java | 27 +++++---- .../system/SysTenantPackageController.java | 16 ++--- .../service/impl/SysMenuServiceImpl.java | 4 +- .../service/impl/SysTenantServiceImpl.java | 58 +++++++++---------- 7 files changed, 67 insertions(+), 68 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java index 7c27230f3..070df3eb3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java @@ -35,7 +35,7 @@ import java.util.List; @RequestMapping("/system/oss/config") public class SysOssConfigController extends BaseController { - private final ISysOssConfigService sysOssConfigService; + private final ISysOssConfigService ossConfigService; /** * 查询对象存储配置列表 @@ -43,7 +43,7 @@ public class SysOssConfigController extends BaseController { @SaCheckPermission("system:oss:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { - return sysOssConfigService.queryPageList(bo, pageQuery); + return ossConfigService.queryPageList(bo, pageQuery); } /** @@ -55,7 +55,7 @@ public class SysOssConfigController extends BaseController { @GetMapping("/{ossConfigId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long ossConfigId) { - return R.ok(sysOssConfigService.queryById(ossConfigId)); + return R.ok(ossConfigService.queryById(ossConfigId)); } /** @@ -66,7 +66,7 @@ public class SysOssConfigController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { - return toAjax(sysOssConfigService.insertByBo(bo)); + return toAjax(ossConfigService.insertByBo(bo)); } /** @@ -77,7 +77,7 @@ public class SysOssConfigController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { - return toAjax(sysOssConfigService.updateByBo(bo)); + return toAjax(ossConfigService.updateByBo(bo)); } /** @@ -90,7 +90,7 @@ public class SysOssConfigController extends BaseController { @DeleteMapping("/{ossConfigIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossConfigIds) { - return toAjax(sysOssConfigService.deleteWithValidByIds(List.of(ossConfigIds), true)); + return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true)); } /** @@ -100,6 +100,6 @@ public class SysOssConfigController extends BaseController { @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysOssConfigBo bo) { - return toAjax(sysOssConfigService.updateOssConfigStatus(bo)); + return toAjax(ossConfigService.updateOssConfigStatus(bo)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java index d03bfcddb..0d844bb71 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java @@ -38,7 +38,7 @@ import java.util.List; @RequestMapping("/system/oss") public class SysOssController extends BaseController { - private final ISysOssService sysOssService; + private final ISysOssService ossService; /** * 查询OSS对象存储列表 @@ -46,7 +46,7 @@ public class SysOssController extends BaseController { @SaCheckPermission("system:oss:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { - return sysOssService.queryPageList(bo, pageQuery); + return ossService.queryPageList(bo, pageQuery); } /** @@ -58,7 +58,7 @@ public class SysOssController extends BaseController { @GetMapping("/listByIds/{ossIds}") public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { - List list = sysOssService.listByIds(Arrays.asList(ossIds)); + List list = ossService.listByIds(Arrays.asList(ossIds)); return R.ok(list); } @@ -74,7 +74,7 @@ public class SysOssController extends BaseController { if (ObjectUtil.isNull(file)) { throw new ServiceException("上传文件不能为空"); } - SysOssVo oss = sysOssService.upload(file); + SysOssVo oss = ossService.upload(file); SysOssUploadVo uploadVo = new SysOssUploadVo(); uploadVo.setUrl(oss.getUrl()); uploadVo.setFileName(oss.getOriginalName()); @@ -90,7 +90,7 @@ public class SysOssController extends BaseController { @SaCheckPermission("system:oss:download") @GetMapping("/download/{ossId}") public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { - sysOssService.download(ossId, response); + ossService.download(ossId, response); } /** @@ -103,7 +103,7 @@ public class SysOssController extends BaseController { @DeleteMapping("/{ossIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { - return toAjax(sysOssService.deleteWithValidByIds(List.of(ossIds), true)); + return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java index 34aaae54f..52f314da8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java @@ -38,7 +38,7 @@ import java.util.Arrays; public class SysProfileController extends BaseController { private final ISysUserService userService; - private final ISysOssService sysOssService; + private final ISysOssService ossService; /** * 个人信息 @@ -110,7 +110,7 @@ public class SysProfileController extends BaseController { if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); } - SysOssVo oss = sysOssService.upload(avatarfile); + SysOssVo oss = ossService.upload(avatarfile); String avatar = oss.getUrl(); if (userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId())) { AvatarVo avatarVo = new AvatarVo(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java index 4a3cf03b2..de40c9be9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java @@ -41,8 +41,7 @@ import java.util.List; @RequestMapping("/system/tenant") public class SysTenantController extends BaseController { - private final ISysTenantService sysTenantService; - private final ISysUserService sysUserService; + private final ISysTenantService tenantService; /** * 查询租户列表 @@ -51,7 +50,7 @@ public class SysTenantController extends BaseController { @SaCheckPermission("system:tenant:list") @GetMapping("/list") public TableDataInfo list(SysTenantBo bo, PageQuery pageQuery) { - return sysTenantService.queryPageList(bo, pageQuery); + return tenantService.queryPageList(bo, pageQuery); } /** @@ -62,7 +61,7 @@ public class SysTenantController extends BaseController { @Log(title = "租户", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysTenantBo bo, HttpServletResponse response) { - List list = sysTenantService.queryList(bo); + List list = tenantService.queryList(bo); ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response); } @@ -76,7 +75,7 @@ public class SysTenantController extends BaseController { @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(sysTenantService.queryById(id)); + return R.ok(tenantService.queryById(id)); } /** @@ -89,10 +88,10 @@ public class SysTenantController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) { - if (!sysTenantService.checkCompanyNameUnique(bo)) { + if (!tenantService.checkCompanyNameUnique(bo)) { throw new ServiceException("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); } - return toAjax(sysTenantService.insertByBo(bo)); + return toAjax(tenantService.insertByBo(bo)); } /** @@ -104,11 +103,11 @@ public class SysTenantController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) { - sysTenantService.checkTenantAllowed(bo.getTenantId()); - if (!sysTenantService.checkCompanyNameUnique(bo)) { + tenantService.checkTenantAllowed(bo.getTenantId()); + if (!tenantService.checkCompanyNameUnique(bo)) { throw new ServiceException("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); } - return toAjax(sysTenantService.updateByBo(bo)); + return toAjax(tenantService.updateByBo(bo)); } /** @@ -119,8 +118,8 @@ public class SysTenantController extends BaseController { @Log(title = "租户", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysTenantBo bo) { - sysTenantService.checkTenantAllowed(bo.getTenantId()); - return toAjax(sysTenantService.updateTenantStatus(bo)); + tenantService.checkTenantAllowed(bo.getTenantId()); + return toAjax(tenantService.updateTenantStatus(bo)); } /** @@ -134,7 +133,7 @@ public class SysTenantController extends BaseController { @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - return toAjax(sysTenantService.deleteWithValidByIds(List.of(ids), true)); + return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true)); } /** @@ -171,7 +170,7 @@ public class SysTenantController extends BaseController { @Log(title = "租户", businessType = BusinessType.UPDATE) @GetMapping("/syncTenantPackage") public R syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, @NotBlank(message = "套餐ID不能为空") String packageId) { - return toAjax(sysTenantService.syncTenantPackage(tenantId, packageId)); + return toAjax(tenantService.syncTenantPackage(tenantId, packageId)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java index a0626c37a..30f8d3036 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java @@ -36,7 +36,7 @@ import java.util.List; @RequestMapping("/system/tenant/package") public class SysTenantPackageController extends BaseController { - private final ISysTenantPackageService sysTenantPackageService; + private final ISysTenantPackageService tenantPackageService; /** * 查询租户套餐列表 @@ -45,7 +45,7 @@ public class SysTenantPackageController extends BaseController { @SaCheckPermission("system:tenantPackage:list") @GetMapping("/list") public TableDataInfo list(SysTenantPackageBo bo, PageQuery pageQuery) { - return sysTenantPackageService.queryPageList(bo, pageQuery); + return tenantPackageService.queryPageList(bo, pageQuery); } /** @@ -56,7 +56,7 @@ public class SysTenantPackageController extends BaseController { @Log(title = "租户套餐", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysTenantPackageBo bo, HttpServletResponse response) { - List list = sysTenantPackageService.queryList(bo); + List list = tenantPackageService.queryList(bo); ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response); } @@ -70,7 +70,7 @@ public class SysTenantPackageController extends BaseController { @GetMapping("/{packageId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long packageId) { - return R.ok(sysTenantPackageService.queryById(packageId)); + return R.ok(tenantPackageService.queryById(packageId)); } /** @@ -82,7 +82,7 @@ public class SysTenantPackageController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) { - return toAjax(sysTenantPackageService.insertByBo(bo)); + return toAjax(tenantPackageService.insertByBo(bo)); } /** @@ -94,7 +94,7 @@ public class SysTenantPackageController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) { - return toAjax(sysTenantPackageService.updateByBo(bo)); + return toAjax(tenantPackageService.updateByBo(bo)); } /** @@ -105,7 +105,7 @@ public class SysTenantPackageController extends BaseController { @Log(title = "租户套餐", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") public R changeStatus(@RequestBody SysTenantPackageBo bo) { - return toAjax(sysTenantPackageService.updatePackageStatus(bo)); + return toAjax(tenantPackageService.updatePackageStatus(bo)); } /** @@ -119,6 +119,6 @@ public class SysTenantPackageController extends BaseController { @DeleteMapping("/{packageIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] packageIds) { - return toAjax(sysTenantPackageService.deleteWithValidByIds(List.of(packageIds), true)); + return toAjax(tenantPackageService.deleteWithValidByIds(List.of(packageIds), true)); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index f2b8486c4..dc7efca36 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -43,7 +43,7 @@ public class SysMenuServiceImpl implements ISysMenuService { private final SysMenuMapper baseMapper; private final SysRoleMapper roleMapper; private final SysRoleMenuMapper roleMenuMapper; - private final SysTenantPackageMapper sysTenantPackageMapper; + private final SysTenantPackageMapper tenantPackageMapper; /** * 根据用户查询系统菜单列表 @@ -160,7 +160,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public List selectMenuListByPackageId(Long packageId) { - SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId); + SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); if (CollUtil.isEmpty(menuIds)) { return List.of(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index 14f2113ee..785e48c3a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -43,16 +43,16 @@ import java.util.List; public class SysTenantServiceImpl implements ISysTenantService { private final SysTenantMapper baseMapper; - private final SysTenantPackageMapper sysTenantPackageMapper; - private final SysUserMapper sysUserMapper; - private final SysDeptMapper sysDeptMapper; - private final SysRoleMapper sysRoleMapper; - private final SysRoleMenuMapper sysRoleMenuMapper; - private final SysRoleDeptMapper sysRoleDeptMapper; - private final SysUserRoleMapper sysUserRoleMapper; - private final SysDictTypeMapper sysDictTypeMapper; - private final SysDictDataMapper sysDictDataMapper; - private final SysConfigMapper sysConfigMapper; + private final SysTenantPackageMapper tenantPackageMapper; + private final SysUserMapper userMapper; + private final SysDeptMapper deptMapper; + private final SysRoleMapper roleMapper; + private final SysRoleMenuMapper roleMenuMapper; + private final SysRoleDeptMapper roleDeptMapper; + private final SysUserRoleMapper userRoleMapper; + private final SysDictTypeMapper dictTypeMapper; + private final SysDictDataMapper dictDataMapper; + private final SysConfigMapper configMapper; /** * 查询租户 @@ -139,14 +139,14 @@ public class SysTenantServiceImpl implements ISysTenantService { dept.setLeader(bo.getUsername()); dept.setParentId(Constants.TOP_PARENT_ID); dept.setAncestors(Constants.TOP_PARENT_ID.toString()); - sysDeptMapper.insert(dept); + deptMapper.insert(dept); Long deptId = dept.getDeptId(); // 角色和部门关联表 SysRoleDept roleDept = new SysRoleDept(); roleDept.setRoleId(roleId); roleDept.setDeptId(deptId); - sysRoleDeptMapper.insert(roleDept); + roleDeptMapper.insert(roleDept); // 创建系统用户 SysUser user = new SysUser(); @@ -155,18 +155,18 @@ public class SysTenantServiceImpl implements ISysTenantService { user.setNickName(bo.getUsername()); user.setPassword(BCrypt.hashpw(bo.getPassword())); user.setDeptId(deptId); - sysUserMapper.insert(user); + userMapper.insert(user); // 用户和角色关联表 SysUserRole userRole = new SysUserRole(); userRole.setUserId(user.getUserId()); userRole.setRoleId(roleId); - sysUserRoleMapper.insert(userRole); + userRoleMapper.insert(userRole); String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID; - List dictTypeList = sysDictTypeMapper.selectList( + List dictTypeList = dictTypeMapper.selectList( new LambdaQueryWrapper().eq(SysDictType::getTenantId, defaultTenantId)); - List dictDataList = sysDictDataMapper.selectList( + List dictDataList = dictDataMapper.selectList( new LambdaQueryWrapper().eq(SysDictData::getTenantId, defaultTenantId)); for (SysDictType dictType : dictTypeList) { dictType.setDictId(null); @@ -176,16 +176,16 @@ public class SysTenantServiceImpl implements ISysTenantService { dictData.setDictCode(null); dictData.setTenantId(tenantId); } - sysDictTypeMapper.insertBatch(dictTypeList); - sysDictDataMapper.insertBatch(dictDataList); + dictTypeMapper.insertBatch(dictTypeList); + dictDataMapper.insertBatch(dictDataList); - List sysConfigList = sysConfigMapper.selectList( + List sysConfigList = configMapper.selectList( new LambdaQueryWrapper().eq(SysConfig::getTenantId, defaultTenantId)); for (SysConfig config : sysConfigList) { config.setConfigId(null); config.setTenantId(tenantId); } - sysConfigMapper.insertBatch(sysConfigList); + configMapper.insertBatch(sysConfigList); TenantHelper.disableIgnore(); return true; @@ -216,7 +216,7 @@ public class SysTenantServiceImpl implements ISysTenantService { */ private Long createTenantRole(String tenantId, Long packageId) { // 获取租户套餐 - SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId); + SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); if (ObjectUtil.isNull(tenantPackage)) { throw new ServiceException("套餐不存在"); } @@ -230,7 +230,7 @@ public class SysTenantServiceImpl implements ISysTenantService { role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY); role.setRoleSort(1); role.setStatus(TenantConstants.NORMAL); - sysRoleMapper.insert(role); + roleMapper.insert(role); Long roleId = role.getRoleId(); // 创建角色菜单 @@ -241,7 +241,7 @@ public class SysTenantServiceImpl implements ISysTenantService { roleMenu.setMenuId(menuId); roleMenus.add(roleMenu); }); - sysRoleMenuMapper.insertBatch(roleMenus); + roleMenuMapper.insertBatch(roleMenus); return roleId; } @@ -319,7 +319,7 @@ public class SysTenantServiceImpl implements ISysTenantService { if (tenant.getAccountCount() == -1) { return true; } - Long userNumber = sysUserMapper.selectCount(new LambdaQueryWrapper<>()); + Long userNumber = userMapper.selectCount(new LambdaQueryWrapper<>()); // 如果余额大于0代表还有可用名额 return tenant.getAccountCount() - userNumber > 0; } @@ -345,8 +345,8 @@ public class SysTenantServiceImpl implements ISysTenantService { @Transactional(rollbackFor = Exception.class) public Boolean syncTenantPackage(String tenantId, String packageId) { TenantHelper.enableIgnore(); - SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId); - List roles = sysRoleMapper.selectList( + SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + List roles = roleMapper.selectList( new LambdaQueryWrapper().eq(SysRole::getTenantId, tenantId)); List roleIds = new ArrayList<>(roles.size() - 1); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); @@ -359,14 +359,14 @@ public class SysTenantServiceImpl implements ISysTenantService { roleMenu.setMenuId(menuId); roleMenus.add(roleMenu); }); - sysRoleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, item.getRoleId())); - sysRoleMenuMapper.insertBatch(roleMenus); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, item.getRoleId())); + roleMenuMapper.insertBatch(roleMenus); } else { roleIds.add(item.getRoleId()); } }); if (!roleIds.isEmpty()) { - sysRoleMenuMapper.delete( + roleMenuMapper.delete( new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysRoleMenu::getMenuId, menuIds)); } TenantHelper.disableIgnore();