From e5beeb0ac94b82c9b414ea9575a4b9311383d539 Mon Sep 17 00:00:00 2001 From: caolin <1149034574@qq.com> Date: Mon, 21 Aug 2023 23:57:39 +0800 Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/TdProjectServiceImpl.java | 12 +++++++----- .../java/com/jwl/driver/server/WechatPayTest.java | 9 +++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/test/java/com/jwl/driver/server/WechatPayTest.java diff --git a/src/main/java/com/jwl/driver/server/service/impl/TdProjectServiceImpl.java b/src/main/java/com/jwl/driver/server/service/impl/TdProjectServiceImpl.java index 53eb08a..161ce6d 100644 --- a/src/main/java/com/jwl/driver/server/service/impl/TdProjectServiceImpl.java +++ b/src/main/java/com/jwl/driver/server/service/impl/TdProjectServiceImpl.java @@ -1,6 +1,7 @@ package com.jwl.driver.server.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jwl.driver.server.constant.Constants; @@ -18,6 +19,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** *

@@ -38,11 +40,11 @@ public class TdProjectServiceImpl extends ServiceImpl resultList = new ArrayList<>(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(TdProject::getProjectId,queryDto.getProjectId()) - .eq(TdProject::getType,queryDto.getType()) - .eq(TdProject::getCarTypeId,queryDto.getCarTypeId()) - .eq(TdProject::getSubject,queryDto.getSubject()) - .eq(TdProject::getDriveType,queryDto.getDriveType()) + .eq(Objects.nonNull(queryDto.getProjectId()),TdProject::getProjectId,queryDto.getProjectId()) + .eq(StrUtil.isNotBlank(queryDto.getType()),TdProject::getType,queryDto.getType()) + .eq(Objects.nonNull(queryDto.getCarTypeId()),TdProject::getCarTypeId,queryDto.getCarTypeId()) + .eq(StrUtil.isNotBlank(queryDto.getSubject()),TdProject::getSubject,queryDto.getSubject()) + .eq(StrUtil.isNotBlank(queryDto.getDriveType()),TdProject::getDriveType,queryDto.getDriveType()) .eq(TdProject::getIsActive, Constants.IS_ACTIVE_TRUE) .orderByAsc(TdProject::getShowOrder); List tdProjects = this.getBaseMapper().selectList(queryWrapper); diff --git a/src/test/java/com/jwl/driver/server/WechatPayTest.java b/src/test/java/com/jwl/driver/server/WechatPayTest.java new file mode 100644 index 0000000..9094eea --- /dev/null +++ b/src/test/java/com/jwl/driver/server/WechatPayTest.java @@ -0,0 +1,9 @@ +package com.jwl.driver.server; + +/** + * @author 曹林 + * @description 微信支付 + * @create 2023/8/21 10:36 + */ +public class WechatPayTest { +}