ZF/molly-multi-tenant
1
0
Fork 0
mirror of https://github.com/thousmile/molly-multi-tenant.git synced 2025-12-30 04:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.升级 pom.xml 依赖

Browse Source 
2.修复 getKeywordsQueryWrapper 根据日期范围查询
This commit is contained in:
Wang Chen Chen
2024-03-29 18:23:40 +08:00
parent 0ba79f60e8
commit 8985fe480f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java
View File

@@ -116,9 +116,9 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
if (ObjectUtils.isNotEmpty(params.getStartDate())) {
// 如果结束时间是否为空
if (ObjectUtils.isNotEmpty(params.getEndDate())) {
wrapper.between(CREATE_TIME, params.getStartDate(), params.getEndDate());
wrapper.between(String.format("DATE(%s)", CREATE_TIME), params.getStartDate(), params.getEndDate());
} else {
wrapper.between(CREATE_TIME, params.getStartDate(), LocalDate.now());
wrapper.between(String.format("DATE(%s)", CREATE_TIME), params.getStartDate(), LocalDate.now());
}
}
if (StringUtils.isNotBlank(params.getKeywords()) && columns != null && !columns.isEmpty()) {

2
server/pom.xml
View File

@@ -55,7 +55,7 @@
<!-- MyBatis 的增强工具，基友搭配，效率翻倍 -->
<mybatis-plus.version>3.5.5</mybatis-plus.version>
<!-- JavaEE 颠覆者 -->
<spring-boot.version>3.2.3</spring-boot.version>
<spring-boot.version>3.2.4</spring-boot.version>
</properties>