diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 31003e4e31..f27d291844 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -151,10 +151,8 @@ public class IcPolicyController { * @date 2022/7/21 09:48 */ @PostMapping("policyListSelect") - public Result> policyListSelect(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyPageFormDTO formDTO){ - formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setStaffId(tokenDto.getUserId()); - return new Result>().ok(icPolicyService.policyListSelect(formDTO)); + public Result> policyListSelect(@LoginUser TokenDto tokenDto){ + return new Result>().ok(icPolicyService.policyListSelect(tokenDto.getUserId(),tokenDto.getCustomerId())); } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index a392aced64..d57a6ca886 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -51,7 +51,7 @@ public interface IcPolicyService extends BaseService { * @author zxc * @date 2022/7/21 09:48 */ - List policyListSelect(IcPolicyPageFormDTO formDTO); + List policyListSelect(String userId,String customerId); List ruleList(String customerId,String policyId); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 65824d663b..77900d2519 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -247,13 +247,12 @@ public class IcPolicyServiceImpl extends BaseServiceImpl policyListSelect(IcPolicyPageFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + public List policyListSelect(String userId,String customerId) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常"); } - formDTO.setAgencyId(staffInfo.getAgencyId()); - return baseDao.policyList(formDTO.getCustomerId(), formDTO.getAgencyId(), null,null,null); + return baseDao.policyList(customerId, staffInfo.getAgencyId(), null,null,null); } @Override