xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-12 20:23:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

同步dev分支

Browse Source
This commit is contained in:
疯狂的狮子li
2021-05-26 16:51:01 +08:00
parent a42ef126cd
commit 08b339b25e
3 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi/pom.xml
View File

@@ -355,6 +355,14 @@
</pluginRepositories>
<profiles>
<profile>
<id>local</id>
<properties>
<!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>local</profiles.active>
<logging.level>debug</logging.level>
</properties>
</profile>
<profile>
<id>dev</id>
<properties>

8
ruoyi/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@@ -55,10 +55,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType())
.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') <= date_format(#{0},'%y%m%d')",
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"));
return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
@@ -110,10 +110,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType())
.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
.apply(Validator.isNotEmpty(params.get("beginTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
"date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
params.get("beginTime"))
.apply(Validator.isNotEmpty(params.get("endTime")),
"date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
"date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
params.get("endTime"));
return baseMapper.selectList(lqw);
}