diff --git a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java index 679948f1..067f9e3d 100644 --- a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.youlai.system.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -43,22 +44,27 @@ public class SysConfigServiceImpl extends ServiceImpl page(ConfigPageQuery configPageQuery) { Page page = new Page<>(configPageQuery.getPageNum(), configPageQuery.getPageSize()); - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(configPageQuery.getKeywords())) { - query.and(q -> q.like(SysConfig::getConfigKey, configPageQuery.getKeywords()).or().like(SysConfig::getConfigName, configPageQuery.getKeywords())); - } + String keywords = configPageQuery.getKeywords(); + LambdaQueryWrapper query = new LambdaQueryWrapper() + .and(StrUtil.isNotBlank(keywords), + q -> q.like(StrUtil.isNotBlank(keywords), SysConfig::getConfigKey, keywords) + .or() + .like(StrUtil.isNotBlank(keywords), SysConfig::getConfigName, keywords) + ); Page pageList = this.page(page, query); return sysConfigConverter.convertToPageVo(pageList); } /** * 保存系统配置 + * * @param configForm 系统配置表单 * @return 是否保存成功 */ @@ -86,7 +92,8 @@ public class SysConfigServiceImpl extends ServiceImpl().eq("id", id)); + return this.update(sysConfig, new LambdaQueryWrapper().eq(SysConfig::getId,id)); } /** * 删除系统配置 + * * @param id 系统配置ID * @return 是否删除成功 */ @Override public boolean delete(Long id) { if (id != null) { - return super.remove(new LambdaQueryWrapper().eq(SysConfig::getId, id)); + return super.remove(new LambdaQueryWrapper().eq(SysConfig::getId,id)); } return false; } /** * 刷新系统配置缓存 + * * @return 是否刷新成功 */ @Override @@ -123,7 +132,7 @@ public class SysConfigServiceImpl extends ServiceImpl list = this.list(); if (list != null) { Map map = list.stream().collect(Collectors.toMap(SysConfig::getConfigKey, SysConfig::getConfigValue)); - redisTemplate.opsForHash().putAll(RedisKeyConstants.SYSTEM_CONFIG_KEY,map); + redisTemplate.opsForHash().putAll(RedisKeyConstants.SYSTEM_CONFIG_KEY, map); return true; } return false; @@ -131,12 +140,13 @@ public class SysConfigServiceImpl extends ServiceImpl