From 7cfac23a7b290417504c77f165dc39577a5212e3 Mon Sep 17 00:00:00 2001
From: liuleilei <234@qq.com>
Date: 星期五, 22 十二月 2023 16:16:57 +0800
Subject: [PATCH] 员工列表

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 182e214..4a8efab 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -17,11 +17,13 @@
 import com.doumee.dao.business.model.*;
 import com.doumee.service.business.CarsService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 杞﹁締淇℃伅琛⊿ervice瀹炵幇
@@ -115,6 +117,12 @@
         queryWrapper.leftJoin(Member.class,Member::getId,Cars::getMemberId);
         queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
 
+
+        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
+                .or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getName,pageWrap.getModel().getCompanyName());
+        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
         queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
 
         queryWrapper.orderByDesc(Cars::getCreateDate);

--
Gitblit v1.9.3