From 50ec1d54cb91bbf6a5898409137ad02f36a45f16 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Mon, 27 Jun 2022 09:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20=E5=85=A5=E5=8F=82=E6=94=B9=E6=88=90=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PartyMemberEventController.java | 2 +- .../service/impl/EventPartyBranchServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index f8ff377..733e008 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -103,7 +103,7 @@ public class PartyMemberEventController { @ApiOperation("党员列表模糊查询") @GetMapping("/partyMember/paramQuery") - public BaseResponse> getPartyMemberListByParam(@RequestParam(value = "belongBranch") String belongBranch, @RequestParam(value = "param") String param) { + public BaseResponse> getPartyMemberListByParam(@RequestParam(value = "belongBranch", required = false) String belongBranch, @RequestParam(value = "param") String param) { return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(belongBranch, param)); } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index 2cc316e..4dad677 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -78,9 +79,12 @@ public class EventPartyBranchServiceImpl extends ServiceImpl getPartyMemberListByParam(String belongBranch, String param) { LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); + if (StrUtil.isNotBlank(belongBranch)) { + queryMember.eq(EventPartyBranch::getBelongBranch, belongBranch); + } + queryMember.eq(EventPartyBranch::getType, "2") .eq(EventPartyBranch::getStatus, "1") - .eq(EventPartyBranch::getBelongBranch, belongBranch) .and(w -> w.like(EventPartyBranch::getContactName, param) .or().like(EventPartyBranch::getContactMobiphone, param) .or().like(EventPartyBranch::getContactEmail, param));