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));