From ef38cf92ad243eddba8c50cb36d639cbc74f2290 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 18:27:05 +0800
Subject: [PATCH] # 空字符串判断
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
index cea52e5..d00f00d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java
@@ -141,6 +141,7 @@
queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator());
queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getBikeCode()+"%");
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getOpenid()+"%");
queryWrapper.eq(ActionLog::getObjType,Constants.ActionLogObjType.memberrides);
queryWrapper
.selectAll(ActionLog.class)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 5237d39..75240e6 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -125,7 +125,7 @@
.like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),BikeRepair::getBinkeId,pageWrap.getModel().getBikeCode())
.eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus());
if (Objects.nonNull(pageWrap.getModel().getStartDate())) {
- queryWrapper.ge(BikeRepair::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getStartDate()));
+ queryWrapper.ge(BikeRepair::getCreateDate,Utils.Date.getStart(pageWrap.getModel().getStartDate()));
}
if (Objects.nonNull(pageWrap.getModel().getEndDate())) {
queryWrapper.le(BikeRepair::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
--
Gitblit v1.9.3