mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2026-07-20 03:26:22 +00:00
update 优化代码格式和可读性,简化条件判断
This commit is contained in:
+2
-2
@@ -88,7 +88,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
|
||||
*/
|
||||
@Override
|
||||
public boolean selectRegisterEnabled() {
|
||||
return Convert.toBool(this.selectConfigByKey("sys.account.registerUser"));
|
||||
return Convert.toBool(this.getConfigValue("sys.account.registerUser"));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -146,7 +146,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
|
||||
@CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey")
|
||||
@Override
|
||||
public String updateConfig(SysConfigBo bo) {
|
||||
int row = 0;
|
||||
int row;
|
||||
SysConfig config = MapstructUtils.convert(bo, SysConfig.class);
|
||||
if (config.getConfigId() != null) {
|
||||
SysConfig temp = configMapper.selectById(config.getConfigId());
|
||||
|
||||
+3
-3
@@ -354,9 +354,9 @@ public class SysMenuServiceImpl implements ISysMenuService {
|
||||
String routeName = StringUtils.isEmpty(menu.getRouteName()) ? path : menu.getRouteName();
|
||||
List<SysMenu> sysMenuList = menuMapper.lambda()
|
||||
.in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
|
||||
.and(w -> {
|
||||
w.eq(SysMenu::getPath, path).or().eq(SysMenu::getPath, routeName);
|
||||
}).list();
|
||||
.and(w ->
|
||||
w.eq(SysMenu::getPath, path).or().eq(SysMenu::getPath, routeName)
|
||||
).list();
|
||||
for (SysMenu sysMenu : sysMenuList) {
|
||||
if (!sysMenu.getMenuId().equals(menuId)) {
|
||||
Long dbParentId = sysMenu.getParentId();
|
||||
|
||||
+4
-4
@@ -209,11 +209,11 @@ public class SysMessageServiceImpl implements ISysMessageService, MessageService
|
||||
// 仅查询30天内消息
|
||||
.ge(SysMessage::getCreateTime, LocalDateTime.now().minusDays(BOX_DAYS))
|
||||
// 全局消息 或 当前用户在接收人范围内
|
||||
.and(wrapper -> {
|
||||
.and(wrapper ->
|
||||
wrapper.eq(SysMessage::getSendUserIds, GLOBAL_USER_IDS)
|
||||
.or()
|
||||
.findInSet(userId, SysMessage::getSendUserIds);
|
||||
})
|
||||
.or()
|
||||
.findInSet(userId, SysMessage::getSendUserIds)
|
||||
)
|
||||
.orderByDesc(SysMessage::getCreateTime, SysMessage::getMessageId)
|
||||
// 分页查询(只查第一页,最多100条)
|
||||
.list(new Page<>(1, BOX_LIMIT, false));
|
||||
|
||||
+1
-4
@@ -201,10 +201,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService {
|
||||
.select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
|
||||
.eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())
|
||||
.one();
|
||||
if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
return ObjectUtil.isNull(info) || ObjectUtil.equals(info.getOssConfigId(), ossConfigId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+7
-7
@@ -29,7 +29,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService, Permissi
|
||||
/**
|
||||
* 获取角色数据权限
|
||||
*
|
||||
* @param userId 用户id
|
||||
* @param userId 用户id
|
||||
* @return 角色权限信息
|
||||
*/
|
||||
@Override
|
||||
@@ -47,7 +47,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService, Permissi
|
||||
/**
|
||||
* 获取菜单数据权限
|
||||
*
|
||||
* @param userId 用户id
|
||||
* @param userId 用户id
|
||||
* @return 菜单权限信息
|
||||
*/
|
||||
@Override
|
||||
@@ -76,11 +76,11 @@ public class SysPermissionServiceImpl implements ISysPermissionService, Permissi
|
||||
List<Long> roleIds = StreamUtils.toList(roles, RoleDTO::getRoleId);
|
||||
Map<Long, Set<String>> permsRoleIds = menuService.selectMenuPermsByRoleIds(roleIds);
|
||||
Map<String, List<Long>> rolePermsMap = new LinkedHashMap<>();
|
||||
permsRoleIds.forEach((roleId, perms) -> {
|
||||
perms.forEach(perm -> {
|
||||
rolePermsMap.computeIfAbsent(perm, key -> new ArrayList<>()).add(roleId);
|
||||
});
|
||||
});
|
||||
permsRoleIds.forEach((roleId, perms) ->
|
||||
perms.forEach(perm ->
|
||||
rolePermsMap.computeIfAbsent(perm, key -> new ArrayList<>()).add(roleId)
|
||||
)
|
||||
);
|
||||
return rolePermsMap;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user