【7.6.0】【sys】整理代码

pull/55/MERGE
fengshuonan 2023-06-13 22:28:13 +08:00
parent 023329f463
commit 86117a715c
4 changed files with 2 additions and 23 deletions

View File

@ -102,13 +102,8 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
private LambdaQueryWrapper<SysRoleDataScope> createWrapper(SysRoleDataScopeRequest sysRoleDataScopeRequest) {
LambdaQueryWrapper<SysRoleDataScope> queryWrapper = new LambdaQueryWrapper<>();
Long roleDataScopeId = sysRoleDataScopeRequest.getRoleDataScopeId();
Long roleId = sysRoleDataScopeRequest.getRoleId();
Long organizationId = sysRoleDataScopeRequest.getOrganizationId();
queryWrapper.eq(ObjectUtil.isNotNull(roleDataScopeId), SysRoleDataScope::getRoleDataScopeId, roleDataScopeId);
queryWrapper.eq(ObjectUtil.isNotNull(roleId), SysRoleDataScope::getRoleId, roleId);
queryWrapper.eq(ObjectUtil.isNotNull(organizationId), SysRoleDataScope::getOrganizationId, organizationId);
return queryWrapper;
}

View File

@ -134,15 +134,8 @@ public class SysRoleMenuOptionsServiceImpl extends ServiceImpl<SysRoleMenuOption
private LambdaQueryWrapper<SysRoleMenuOptions> createWrapper(SysRoleMenuOptionsRequest sysRoleMenuOptionsRequest) {
LambdaQueryWrapper<SysRoleMenuOptions> queryWrapper = new LambdaQueryWrapper<>();
Long roleMenuOptionId = sysRoleMenuOptionsRequest.getRoleMenuOptionId();
Long roleId = sysRoleMenuOptionsRequest.getRoleId();
Long menuOptionId = sysRoleMenuOptionsRequest.getMenuOptionId();
Long tenantId = sysRoleMenuOptionsRequest.getTenantId();
queryWrapper.eq(ObjectUtil.isNotNull(roleMenuOptionId), SysRoleMenuOptions::getRoleMenuOptionId, roleMenuOptionId);
queryWrapper.eq(ObjectUtil.isNotNull(roleId), SysRoleMenuOptions::getRoleId, roleId);
queryWrapper.eq(ObjectUtil.isNotNull(menuOptionId), SysRoleMenuOptions::getMenuOptionId, menuOptionId);
queryWrapper.eq(ObjectUtil.isNotNull(tenantId), SysRoleMenuOptions::getTenantId, tenantId);
return queryWrapper;
}

View File

@ -102,12 +102,10 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
private LambdaQueryWrapper<SysRoleMenu> createWrapper(SysRoleMenuRequest sysRoleMenuRequest) {
LambdaQueryWrapper<SysRoleMenu> queryWrapper = new LambdaQueryWrapper<>();
Long roleMenuId = sysRoleMenuRequest.getRoleMenuId();
Long roleId = sysRoleMenuRequest.getRoleId();
Long menuId = sysRoleMenuRequest.getMenuId();
queryWrapper.eq(ObjectUtil.isNotNull(roleMenuId), SysRoleMenu::getRoleMenuId, roleMenuId);
queryWrapper.eq(ObjectUtil.isNotNull(roleId), SysRoleMenu::getRoleId, roleId);
Long menuId = sysRoleMenuRequest.getMenuId();
queryWrapper.eq(ObjectUtil.isNotNull(menuId), SysRoleMenu::getMenuId, menuId);
return queryWrapper;

View File

@ -102,15 +102,8 @@ public class SysRoleResourceServiceImpl extends ServiceImpl<SysRoleResourceMappe
private LambdaQueryWrapper<SysRoleResource> createWrapper(SysRoleResourceRequest sysRoleResourceRequest) {
LambdaQueryWrapper<SysRoleResource> queryWrapper = new LambdaQueryWrapper<>();
Long roleResourceId = sysRoleResourceRequest.getRoleResourceId();
Long roleId = sysRoleResourceRequest.getRoleId();
String resourceCode = sysRoleResourceRequest.getResourceCode();
Integer resourceBizType = sysRoleResourceRequest.getResourceBizType();
queryWrapper.eq(ObjectUtil.isNotNull(roleResourceId), SysRoleResource::getRoleResourceId, roleResourceId);
queryWrapper.eq(ObjectUtil.isNotNull(roleId), SysRoleResource::getRoleId, roleId);
queryWrapper.like(ObjectUtil.isNotEmpty(resourceCode), SysRoleResource::getResourceCode, resourceCode);
queryWrapper.eq(ObjectUtil.isNotNull(resourceBizType), SysRoleResource::getResourceBizType, resourceBizType);
return queryWrapper;
}