Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev

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<CustomerCompanyVO> queryCompanysPageByServiceProviderIdAndNameAndStatus(@RequestParam String serviceProviderId, String name, @RequestParam Integer status, @RequestParam Long current, @RequestParam Integer size) {
+    public PageResult<CustomerCompanyVO> queryCompanysPageByServiceProviderIdAndNameAndStatus(String serviceProviderId, String name, @RequestParam Integer status, @RequestParam Long current, @RequestParam Integer size) {
         return customerCompanyService.queryCompanysPageByServiceProviderIdAndNameAndStatus(serviceProviderId, name, status, current, size);
     }
 

user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java

@@ -253,16 +253,17 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
         IPage<CustomerCompany> page = new Page<>(current, size);
         QueryWrapper<CustomerCompany> wrapper = new QueryWrapper<>();
         try {
-            //根据服务商Id与企业Id的对应情况查企业Id
-            QueryWrapper<CustomerServiceProviderEnterprise> tempWrapper = new QueryWrapper<>();
-            tempWrapper.eq("service_provider_id", serviceProviderId);
-            List<CustomerServiceProviderEnterprise> temp = customerServiceProviderEnterpriseMapper.selectList(tempWrapper);
-            List<String> companyIds = new ArrayList<>();
-            for (CustomerServiceProviderEnterprise tt : temp) {
-                companyIds.add(tt.getEnterpriseId());
+            if(!StringUtils.isEmpty(serviceProviderId)){
+                //根据服务商Id与企业Id的对应情况查企业Id
+                QueryWrapper<CustomerServiceProviderEnterprise> tempWrapper = new QueryWrapper<>();
+                tempWrapper.eq("service_provider_id", serviceProviderId);
+                List<CustomerServiceProviderEnterprise> temp = customerServiceProviderEnterpriseMapper.selectList(tempWrapper);
+                List<String> 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);
             }