From b21af4db152cb774b29ee32f9429ee8929e5daa7 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Tue, 28 Jun 2022 13:38:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PartyMemberEventController.java | 2 +- .../service/impl/EventPartyBranchServiceImpl.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 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 456e40b..c0e688d 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", required = false) String belongBranch, @RequestParam(value = "param") String param) { + public BaseResponse> getPartyMemberListByParam(@RequestParam(value = "belongBranch", required = false) String belongBranch, @RequestParam(value = "param", required = false) 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 531efeb..bae6d47 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 @@ -96,12 +96,14 @@ public class EventPartyBranchServiceImpl extends ServiceImpl w.like(EventPartyBranch::getContactName, param) + .or().like(EventPartyBranch::getContactMobiphone, param) + .or().like(EventPartyBranch::getContactEmail, param)); + } queryMember.eq(EventPartyBranch::getType, "2") - .eq(EventPartyBranch::getStatus, "1") - .and(w -> w.like(EventPartyBranch::getContactName, param) - .or().like(EventPartyBranch::getContactMobiphone, param) - .or().like(EventPartyBranch::getContactEmail, param)); + .eq(EventPartyBranch::getStatus, "1"); return this.list(queryMember); }