From 530b1dd3b7746a40592237a3292d6f43f1b9e117 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
index 33f91cc..76454bb 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarEventServiceImpl.java
@@ -317,12 +317,6 @@
}
private IPage<CarEventDTO> getDataInfo(PageWrap<CarEvent> pageWrap) {
- //鏄惁鏄暟瀛�
- boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
- //鏄惁鍖呭惈涓枃
- boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
- //鏄惁鍖呭惈鑻辨枃
- boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
IPage<CarEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<CarEvent> queryWrapper = new MPJLambdaWrapper<>();
@@ -337,15 +331,14 @@
.selectAs(Member::getIdcardDecode,CarEventDTO::getPersonIdcardDecode)
.selectAs(Member::getName,CarEventDTO::getPersonName)
.selectAs(Company::getName,CarEventDTO::getPersonCompanyName);
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
+
+ queryWrapper
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getPlateNos()),
CarEvent::getPlateNos,
pageWrap.getModel().getPlateNos())
- .like(number,
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
- .like((b || hasWord),
- Member::getPhone,
- pageWrap.getModel().getKeyWords())
+
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyWords()),i->i.like(Member::getPhone,pageWrap.getModel().getKeyWords()).or().like(Member::getPhone,
+ pageWrap.getModel().getKeyWords()))
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
--
Gitblit v1.9.3