党员活动 查询参数

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<List<EventPartyBranch>> getPartyMemberListByParam(@RequestParam(value = "belongBranch", required = false) String belongBranch, @RequestParam(value = "param") String param) {
+    public BaseResponse<List<EventPartyBranch>> getPartyMemberListByParam(@RequestParam(value = "belongBranch", required = false) String belongBranch, @RequestParam(value = "param", required = false) String param) {
         return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(belongBranch, param));
     }
 }

src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java

@@ -96,12 +96,14 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
         if (StrUtil.isNotBlank(belongBranch)) {
             queryMember.eq(EventPartyBranch::getBelongBranch, belongBranch);
         }
+        if (StrUtil.isNotBlank(param)) {
+            queryMember.and(w -> w.like(EventPartyBranch::getContactName, param)
+                    .or().like(EventPartyBranch::getContactMobiphone, param)
+                    .or().like(EventPartyBranch::getContactEmail, param));
+        }
 
         queryMember.eq(EventPartyBranch::getType, "2")
-                .eq(EventPartyBranch::getStatus, "1")
+                .eq(EventPartyBranch::getStatus, "1");
-                .and(w -> w.like(EventPartyBranch::getContactName, param)
-                        .or().like(EventPartyBranch::getContactMobiphone, param)
-                        .or().like(EventPartyBranch::getContactEmail, param));
         return this.list(queryMember);
     }