From da8981e961519b6bb0bd8c99628a220edc822209 Mon Sep 17 00:00:00 2001 From: 1517874642 <1517874642@qq.com> Date: Fri, 11 Dec 2020 16:36:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20serviceProviderId=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E9=A1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/controller/CompanyController.java | 2 +- .../impl/CustomerCompanyServiceImpl.java | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java index 670b27b..58dad4d 100644 --- a/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java +++ b/user-service/src/main/java/com/hp/user/service/controller/CompanyController.java @@ -241,7 +241,7 @@ public class CompanyController { */ @ApiOperation(value = "根据服务商Id、企业姓名、审核状态分页查询企业", notes = "审核状态\"全部\"则status=0") @GetMapping("/queryCompanysPageByServiceProviderIdAndNameAndStatus") - public PageResult queryCompanysPageByServiceProviderIdAndNameAndStatus(@RequestParam String serviceProviderId, String name, @RequestParam Integer status, @RequestParam Long current, @RequestParam Integer size) { + public PageResult queryCompanysPageByServiceProviderIdAndNameAndStatus(String serviceProviderId, String name, @RequestParam Integer status, @RequestParam Long current, @RequestParam Integer size) { return customerCompanyService.queryCompanysPageByServiceProviderIdAndNameAndStatus(serviceProviderId, name, status, current, size); } diff --git a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java index 50e6b66..d8ed689 100644 --- a/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java +++ b/user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java @@ -253,16 +253,17 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService { IPage page = new Page<>(current, size); QueryWrapper wrapper = new QueryWrapper<>(); try { - //根据服务商Id与企业Id的对应情况查企业Id - QueryWrapper tempWrapper = new QueryWrapper<>(); - tempWrapper.eq("service_provider_id", serviceProviderId); - List temp = customerServiceProviderEnterpriseMapper.selectList(tempWrapper); - List companyIds = new ArrayList<>(); - for (CustomerServiceProviderEnterprise tt : temp) { - companyIds.add(tt.getEnterpriseId()); + if(!StringUtils.isEmpty(serviceProviderId)){ + //根据服务商Id与企业Id的对应情况查企业Id + QueryWrapper tempWrapper = new QueryWrapper<>(); + tempWrapper.eq("service_provider_id", serviceProviderId); + List temp = customerServiceProviderEnterpriseMapper.selectList(tempWrapper); + List companyIds = new ArrayList<>(); + for (CustomerServiceProviderEnterprise tt : temp) { + companyIds.add(tt.getEnterpriseId()); + } + wrapper.in("customer_id", companyIds); } - wrapper.in("customer_id", companyIds); - if (status != 0) { wrapper.eq("status", status); }