From c33c3de43afabebbc685f0738843a7ac53ae50c5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 五月 2021 17:14:53 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 7f694ae..d5aeec2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -91,8 +91,12 @@
lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
Map<String, Object> params = config.getParams();
- lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
- SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
+ lqw.apply(Validator.isNotEmpty(params.get("beginTime")),
+ "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
+ params.get("beginTime"));
+ lqw.apply(Validator.isNotEmpty(params.get("endTime")),
+ "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
+ params.get("endTime"));
return baseMapper.selectList(lqw);
}
--
Gitblit v1.9.3