From 2b4e18b49c44c635a2185d0737608cd8b9193313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E5=A4=9A=E5=AE=9D=E5=AE=9D?= Date: Fri, 16 Jan 2026 11:37:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E4=BB=A3=E7=90=86=E5=95=86=E5=91=98=E5=B7=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=92=8C=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdminAgentEmployeeRelationController.java | 5 +++-- .../req/AgentEmployeeRelationQueryReq.java | 3 --- .../IAdminAgentEmployeeRelationService.java | 6 ++---- .../AdminAgentEmployeeRelationServiceImpl.java | 15 ++++++++------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/AdminAgentEmployeeRelationController.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/AdminAgentEmployeeRelationController.java index 5f706eb..38269ea 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/AdminAgentEmployeeRelationController.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/AdminAgentEmployeeRelationController.java @@ -63,7 +63,8 @@ public class AdminAgentEmployeeRelationController { @Operation(summary = "根据代理商ID获取员工列表") @GetMapping("/by-agent/{agentId}") @SaCheckPermission("mp:admin:agent:employee:by-agent") - public ResultBean> getByAgent(@PathVariable Integer agentId) { - return ResultBean.success(agentEmployeeRelationService.getEmployeeRelationsByAgentId(agentId)); + public ResultBean> getByAgent(@PathVariable Integer agentId, + @RequestBody @Validated AgentEmployeeRelationQueryReq query) { + return ResultBean.success(agentEmployeeRelationService.getEmployeeRelationsByAgentId(agentId, query)); } } \ No newline at end of file diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationQueryReq.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationQueryReq.java index a3944ac..d3e814b 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationQueryReq.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationQueryReq.java @@ -8,9 +8,6 @@ import lombok.Data; @Data public class AgentEmployeeRelationQueryReq extends PageRequest { - @Schema(description = "代理商名称") - private String agentName; - @Schema(description = "员工名称") private String employeeName; diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java index 07d3d9d..6ce2aff 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java @@ -1,12 +1,10 @@ package com.seer.teach.mp.admin.service; import com.seer.teach.common.PageListBean; +import com.seer.teach.mp.admin.controller.req.AgentEmployeeRelationQueryReq; import com.seer.teach.mp.admin.controller.req.AgentEmployeeSaveReq; import com.seer.teach.mp.admin.controller.req.AgentEmployeeUpdateReq; import com.seer.teach.mp.admin.controller.resp.AgentEmployeeRelationResp; -import com.seer.teach.mp.admin.controller.req.AgentEmployeeRelationQueryReq; - -import java.util.List; /** *

@@ -56,7 +54,7 @@ public interface IAdminAgentEmployeeRelationService { * @param agentId 代理商ID * @return 员工关联列表 */ - List getEmployeeRelationsByAgentId(Integer agentId); + PageListBean getEmployeeRelationsByAgentId(Integer agentId,AgentEmployeeRelationQueryReq query); /** * 新增代理商员工关联（管理端） diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java index d0c3aca..3fe5c25 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java @@ -22,7 +22,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; import java.util.Objects; /** @@ -48,7 +47,6 @@ public class AdminAgentEmployeeRelationServiceImpl implements IAdminAgentEmploye public PageListBean pageList(AgentEmployeeRelationQueryReq query) { Page pageParm = new Page<>(query.getPageNo(), query.getPageSize()); var pageResult = agentEmployeeRelationService.page(pageParm, new LambdaQueryWrapper<>(MpAgentEmployeeRelationEntity.class) - .like(Objects.nonNull(query.getAgentName()), MpAgentEmployeeRelationEntity::getAgentName, query.getAgentName()) .like(Objects.nonNull(query.getEmployeeName()), MpAgentEmployeeRelationEntity::getEmployeeName, query.getEmployeeName()) .eq(Objects.nonNull(query.getStatus()), MpAgentEmployeeRelationEntity::getStatus, query.getStatus())); @@ -97,11 +95,14 @@ public class AdminAgentEmployeeRelationServiceImpl implements IAdminAgentEmploye } @Override - public List getEmployeeRelationsByAgentId(Integer agentId) { - var relations = agentEmployeeRelationService.getEmployeeRelationsByAgentId(agentId); - return relations.stream() - .map(AdminAgentEmployeeRelationConvert.INSTANCE::convertToResp) - .toList(); + public PageListBean getEmployeeRelationsByAgentId(Integer agentId,AgentEmployeeRelationQueryReq query) { + Page page = new Page<>(query.getPageNo(), query.getPageSize()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MpAgentEmployeeRelationEntity::getAgentId, agentId) + .like(Objects.nonNull(query.getEmployeeName()), MpAgentEmployeeRelationEntity::getEmployeeName, query.getEmployeeName()) + .eq(Objects.nonNull(query.getStatus()), MpAgentEmployeeRelationEntity::getStatus, query.getStatus()); + Page pageParm = agentEmployeeRelationService.page(page, wrapper); + return PageConverterUtils.convertPageListBean(pageParm, AdminAgentEmployeeRelationConvert.INSTANCE::convertToRespList); } @Override