diff --git a/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java b/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java
index 5beba54..a4cdc09 100644
--- a/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java
+++ b/user-client/src/main/java/com/hp/user/client/entity/AccountVO.java
@@ -45,11 +45,19 @@ public class AccountVO{
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 启用状态：0:启用；1：禁用
+     */
+    private Short status;
+    /**
+     * 对应角色Id
+     */
+    private String roleId;
 
 
     public AccountVO(){}
 
-    public AccountVO(String userId, String userName, String wxNumber, String phone, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) {
+    public AccountVO(String userId, String userName, String wxNumber, String phone, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short status, String roleId) {
         this.userId = userId;
         this.userName = userName;
         this.wxNumber = wxNumber;
@@ -58,6 +66,8 @@ public class AccountVO{
         this.sysCreator = sysCreator;
         this.sysUpdateTime = sysUpdateTime;
         this.sysUpdater = sysUpdater;
+        this.status = status;
+        this.roleId = roleId;
     }
 
     public String getUserId() {
@@ -123,4 +133,20 @@ public class AccountVO{
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
 }
diff --git a/user-client/src/main/java/com/hp/user/client/entity/AuditVO.java b/user-client/src/main/java/com/hp/user/client/entity/AuditVO.java
index 0989a53..2171010 100644
--- a/user-client/src/main/java/com/hp/user/client/entity/AuditVO.java
+++ b/user-client/src/main/java/com/hp/user/client/entity/AuditVO.java
@@ -51,10 +51,14 @@ public class AuditVO {
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 跟进状态；0：未跟进；1：跟进
+     */
+    private Short follow;
 
     public AuditVO(){}
 
-    public AuditVO(String auditId, String userId, Short status, Short vipLevel, Short source, String causeBy, String remarks, Short isReply, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) {
+    public AuditVO(String auditId, String userId, Short status, Short vipLevel, Short source, String causeBy, String remarks, Short isReply, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short follow) {
         this.auditId = auditId;
         this.userId = userId;
         this.status = status;
@@ -67,6 +71,7 @@ public class AuditVO {
         this.sysCreator = sysCreator;
         this.sysUpdateTime = sysUpdateTime;
         this.sysUpdater = sysUpdater;
+        this.follow = follow;
     }
 
     public String getAuditId() {
@@ -164,4 +169,12 @@ public class AuditVO {
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getFollow() {
+        return follow;
+    }
+
+    public void setFollow(Short follow) {
+        this.follow = follow;
+    }
 }
diff --git a/user-client/src/main/java/com/hp/user/client/entity/CompanyAuditVO.java b/user-client/src/main/java/com/hp/user/client/entity/CompanyAuditVO.java
index 21b686b..24b9b05 100644
--- a/user-client/src/main/java/com/hp/user/client/entity/CompanyAuditVO.java
+++ b/user-client/src/main/java/com/hp/user/client/entity/CompanyAuditVO.java
@@ -28,6 +28,18 @@ public class CompanyAuditVO {
      * 地址
      */
     private String address;
+    /**
+     * 省份编码
+     */
+    private String provinceCode;
+    /**
+     * 城市编码
+     */
+    private String cityCode;
+    /**
+     * 区县编码
+     */
+    private String countCode;
     /**
      * 企业税号
      */
@@ -94,6 +106,10 @@ public class CompanyAuditVO {
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 跟进状态；0：未跟进；1：跟进
+     */
+    private Short follow;
 
     public String getName() {
         return name;
@@ -270,4 +286,36 @@ public class CompanyAuditVO {
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getFollow() {
+        return follow;
+    }
+
+    public void setFollow(Short follow) {
+        this.follow = follow;
+    }
+
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCountCode() {
+        return countCode;
+    }
+
+    public void setCountCode(String countCode) {
+        this.countCode = countCode;
+    }
 }
diff --git a/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java b/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java
index 4944509..64ed363 100644
--- a/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java
+++ b/user-client/src/main/java/com/hp/user/client/entity/CustomerCompanyVO.java
@@ -88,10 +88,14 @@ public class CustomerCompanyVO {
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 审核状态；1待审核；2审核通过；3审核未通过
+     */
+    private Short status;
 
     public CustomerCompanyVO(){}
 
-    public CustomerCompanyVO(String customerId, String name, Short type, Short industryCode, String longitude, String latitude, String address, String provinceCode, String cityCode, String countCode, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Short sysDeleted, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) {
+    public CustomerCompanyVO(String customerId, String name, Short type, Short industryCode, String longitude, String latitude, String address, String provinceCode, String cityCode, String countCode, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Short sysDeleted, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short status) {
         this.customerId = customerId;
         this.name = name;
         this.type = type;
@@ -111,6 +115,7 @@ public class CustomerCompanyVO {
         this.sysCreator = sysCreator;
         this.sysUpdateTime = sysUpdateTime;
         this.sysUpdater = sysUpdater;
+        this.status = status;
     }
 
     public String getCustomerId() {
@@ -264,4 +269,12 @@ public class CustomerCompanyVO {
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
 }
diff --git a/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java b/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java
index 4e47d7c..6f9fa20 100644
--- a/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java
+++ b/user-client/src/main/java/com/hp/user/client/service/CustomerCompanyService.java
@@ -19,7 +19,8 @@ public interface CustomerCompanyService {
     public boolean delete(String companyId);
     public boolean update(CustomerCompanyVO company);
     public CustomerCompanyVO queryCompanyByCompanyId(String companyId);
-    public CompanyPage getCompanysPage(Long current, Integer size);
+    public CompanyPage getCompanysPage(Long current, Integer size,Integer type);
+    public CompanyPage queryServiceProvidersByName(String name, Long current, Integer size);
     public CompanyPage queryCompanysPageByNameAndServiceAndStatus(String name, String serviceProviderName, Integer status, Long current, Integer size);
     public CompanyAuditPage getCompanyAuditsPage(Long current, Integer size);
     public CompanyAuditPage queryCompanysPageByNameAndStatusAndCreateTime(String name, Integer status, Date startTime,Date endTime, Long current, Integer size);
diff --git a/user-service/src/main/java/com/hp/user/service/controller/AddressController.java b/user-service/src/main/java/com/hp/user/service/controller/AddressController.java
index a91f9b4..1bb8892 100644
--- a/user-service/src/main/java/com/hp/user/service/controller/AddressController.java
+++ b/user-service/src/main/java/com/hp/user/service/controller/AddressController.java
@@ -24,7 +24,7 @@ public class AddressController {
      * @return HttpResult
      */
     @ApiOperation(value = "新增地址")
-    @PostMapping("/addCompany")
+    @PostMapping("/addAddress")
     public HttpResult addAddress(@RequestBody AddressVO address){
         address.setAddressId(IdWorker.generactorId().toString());
         boolean flag = addressService.insert(address);
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 e922ed9..a436e63 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
@@ -24,15 +24,15 @@ public class CompanyController {
     private AuditService auditService;
 
     /**
-     * 添加企业
+     * 添加企业/服务商
      *
-     * @param company 企业信息
+     * @param company 企业/服务商信息
      * @return HttpResult
      */
-    @ApiOperation(value = "新增企业", notes = "新增企业", httpMethod = "POST")
+    @ApiOperation(value = "新增企业/服务商", notes = "提示：要指定审核状态 status；服务商type=0，企业type=1", httpMethod = "POST")
     @PostMapping("/addCompany")
     @Transactional
-    public HttpResult addCompany(@RequestBody CustomerCompanyVO company, @RequestBody AddressVO address) {
+    public HttpResult addCompany(@RequestBody CustomerCompanyVO company) {
         company.setCustomerId(IdWorker.generactorId().toString());
         boolean flag = customerCompanyService.insert(company);
         if (flag) return HttpResult.success(company.getCustomerId());
@@ -40,14 +40,14 @@ public class CompanyController {
     }
 
     /**
-     * 更新企业信息
+     * 更新企业/服务商信息
      *
-     * @param company 企业信息
+     * @param company 企业/服务商信息
      * @return HttpResult
      */
-    @ApiOperation(value = "更新企业信息", notes = "更新企业信息", httpMethod = "POST")
+    @ApiOperation(value = "更新企业/服务商信息")
     @PostMapping("/updateCompany")
-    public HttpResult updateCompany(@RequestBody CustomerCompanyVO company, @RequestBody AddressVO address) {
+    public HttpResult updateCompany(@RequestBody CustomerCompanyVO company) {
         boolean flag = customerCompanyService.update(company);
         if (flag) return HttpResult.success();
         else return HttpResult.fail("更新失败");
@@ -59,7 +59,7 @@ public class CompanyController {
      * @param companyId 企业Id
      * @return HttpResult
      */
-    @ApiOperation(value = "删除企业", notes = "删除企业", httpMethod = "GET")
+    @ApiOperation(value = "删除企业/服务商")
     @GetMapping("/deleteCompanyByCompanyId")
     public HttpResult deleteCompanyByCompanyId(@RequestParam String companyId) {
         boolean flag = customerCompanyService.delete(companyId);
@@ -73,12 +73,12 @@ public class CompanyController {
      * @param companyId 企业Id
      * @return HttpResult
      */
-    @ApiOperation(value = "根据企业Id查询某企业信息")
+    @ApiOperation(value = "根据企业/服务商Id 查询某企业/服务商信息")
     @GetMapping("/queryCompanyByCompanyId")
     public HttpResult queryCompanyByCompanyId(@RequestParam String companyId) {
         CustomerCompanyVO companyVO = customerCompanyService.queryCompanyByCompanyId(companyId);
         if (companyVO != null) return HttpResult.success(companyVO);
-        else return HttpResult.fail("查询失败/该企业已被删除");
+        else return HttpResult.fail("查询失败/已被删除");
     }
 
     /**
@@ -88,10 +88,25 @@ public class CompanyController {
      * @param size    一页的行数
      * @return HttpResult
      */
-    @ApiOperation(value = "分页查询所有企业", notes = "输入的current为要查询的页数，size为一页的行数，返回的total为总行数")
+    @ApiOperation(value = "分页查询所有企业/服务商", notes = "输入的current为要查询的页数，size为一页的行数，返回的total为总行数，服务商type为0，企业type为1")
     @GetMapping("/queryAllCompanyByPage")
-    public HttpResult queryAllCompanyByPage(@RequestParam Long current, @RequestParam Integer size) {
-        CompanyPage companyPage = customerCompanyService.getCompanysPage(current, size);
+    public HttpResult queryAllCompanyByPage(@RequestParam Long current, @RequestParam Integer size, @RequestParam Integer type) {
+        CompanyPage companyPage = customerCompanyService.getCompanysPage(current, size, type);
+        if (companyPage != null) return HttpResult.success(companyPage);
+        else return HttpResult.fail("查询失败");
+    }
+
+    /**
+     * 根据服务商姓名分页查询服务商
+     * @param name    服务商名称
+     * @param current 要查询页数
+     * @param size    一页的行数
+     * @return HttpResult
+     */
+    @ApiOperation(value = "根据服务商姓名分页查询服务商")
+    @GetMapping("/queryServiceProvidersPageByName")
+    public HttpResult queryServiceProvidersPageByName(String name, @RequestParam Long current, @RequestParam Integer size) {
+        CompanyPage companyPage = customerCompanyService.queryServiceProvidersByName(name, current, size);
         if (companyPage != null) return HttpResult.success(companyPage);
         else return HttpResult.fail("查询失败");
     }
@@ -106,7 +121,7 @@ public class CompanyController {
      * @param size                一页的行数
      * @return HttpResult
      */
-    @ApiOperation(value = "根据企业姓名、关联服务商、审核状态分页查询企业", notes = "若查询服务商，则只需要填name，serviceProviderName为空，status为0")
+    @ApiOperation(value = "根据企业姓名、关联服务商、审核状态分页查询企业", notes = "审核状态\"全部\"则status=0")
     @GetMapping("/queryCompanysPageByNameAndServiceProviderAndStatus")
     public HttpResult queryCompanysPageByNameAndServiceProviderAndStatus(String name, String serviceProviderName, @RequestParam Integer status, @RequestParam Long current, @RequestParam Integer size) {
         CompanyPage companyPage = customerCompanyService.queryCompanysPageByNameAndServiceAndStatus(name, serviceProviderName, status, current, size);
@@ -126,11 +141,13 @@ public class CompanyController {
     @Transactional
     public HttpResult becomeContractUser(@RequestBody CustomerCompanyVO company, @RequestBody boolean willing) {
         company.setCustomerId(IdWorker.generactorId().toString());
+        company.setType((short)1); // 企业
+        company.setStatus((short)1); // 未审核
         AuditVO audit = new AuditVO();
         audit.setAuditId(IdWorker.generactorId().toString());
         audit.setUserId(company.getCustomerId());
-        audit.setStatus((short) 1);
-        audit.setSource((short) 1);
+        audit.setStatus((short) 1); // 未审核
+        audit.setSource((short) 1); // 来源：维信
         // 愿意成为合同用户
         if (willing) audit.setVipLevel((short) 1); // 普通会员
         else audit.setVipLevel((short) 2); // 意向用户
@@ -156,6 +173,7 @@ public class CompanyController {
     }
 
     /**
+     * 根据企业姓名、审核状态、提交时间分页查询认证企业
      * @param name      企业名称
      * @param status    审核状态
      * @param startTime 提交时间的开始间隔
@@ -172,6 +190,8 @@ public class CompanyController {
         else return HttpResult.fail("查询失败");
     }
 
+//    public HttpResult queryContectUserByBusinessContectAndPhone
+
 //    /**
 //     * 查询某企业的所有用户
 //     * @param companyId 企业Id
diff --git a/user-service/src/main/java/com/hp/user/service/entity/Account.java b/user-service/src/main/java/com/hp/user/service/entity/Account.java
index f1f3c9f..7376869 100644
--- a/user-service/src/main/java/com/hp/user/service/entity/Account.java
+++ b/user-service/src/main/java/com/hp/user/service/entity/Account.java
@@ -25,7 +25,7 @@ public class Account implements Serializable {
      * 用户Id
      */
     @TableId(value = "user_id")
-    private Long userId;
+    private String userId;
     /**
      * 用户名
      */
@@ -54,10 +54,18 @@ public class Account implements Serializable {
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 启用状态：0:启用；1：禁用
+     */
+    private Short status;
+    /**
+     * 对应角色Id
+     */
+    private String roleId;
 
     public Account(){}
 
-    public Account(Long userId, String userName, String wxNumber, String phone, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) {
+    public Account(String userId, String userName, String wxNumber, String phone, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short status, String roleId) {
         this.userId = userId;
         this.userName = userName;
         this.wxNumber = wxNumber;
@@ -66,13 +74,15 @@ public class Account implements Serializable {
         this.sysCreator = sysCreator;
         this.sysUpdateTime = sysUpdateTime;
         this.sysUpdater = sysUpdater;
+        this.status = status;
+        this.roleId = roleId;
     }
 
-    public Long getUserId() {
+    public String getUserId() {
         return userId;
     }
 
-    public void setUserId(Long userId) {
+    public void setUserId(String userId) {
         this.userId = userId;
     }
 
@@ -131,4 +141,20 @@ public class Account implements Serializable {
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
 }
diff --git a/user-service/src/main/java/com/hp/user/service/entity/Audit.java b/user-service/src/main/java/com/hp/user/service/entity/Audit.java
index 2902a51..3c9d17d 100644
--- a/user-service/src/main/java/com/hp/user/service/entity/Audit.java
+++ b/user-service/src/main/java/com/hp/user/service/entity/Audit.java
@@ -62,10 +62,14 @@ public class Audit implements Serializable {
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 跟进状态；0：未跟进；1：跟进
+     */
+    private Short follow;
 
     public Audit(){}
 
-    public Audit(String auditId, String userId, Short status, Short vipLevel, Short source, String causeBy, String remarks, Short isReply, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) {
+    public Audit(String auditId, String userId, Short status, Short vipLevel, Short source, String causeBy, String remarks, Short isReply, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short follow) {
         this.auditId = auditId;
         this.userId = userId;
         this.status = status;
@@ -78,6 +82,7 @@ public class Audit implements Serializable {
         this.sysCreator = sysCreator;
         this.sysUpdateTime = sysUpdateTime;
         this.sysUpdater = sysUpdater;
+        this.follow = follow;
     }
 
     public String getAuditId() {
@@ -175,4 +180,12 @@ public class Audit implements Serializable {
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getFollow() {
+        return follow;
+    }
+
+    public void setFollow(Short follow) {
+        this.follow = follow;
+    }
 }
diff --git a/user-service/src/main/java/com/hp/user/service/entity/CompanyAudit.java b/user-service/src/main/java/com/hp/user/service/entity/CompanyAudit.java
index 37801dd..77717ac 100644
--- a/user-service/src/main/java/com/hp/user/service/entity/CompanyAudit.java
+++ b/user-service/src/main/java/com/hp/user/service/entity/CompanyAudit.java
@@ -30,6 +30,18 @@ public class CompanyAudit {
      * 地址
      */
     private String address;
+    /**
+     * 省份编码
+     */
+    private String provinceCode;
+    /**
+     * 城市编码
+     */
+    private String cityCode;
+    /**
+     * 区县编码
+     */
+    private String countCode;
     /**
      * 企业税号
      */
@@ -96,6 +108,10 @@ public class CompanyAudit {
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 跟进状态；0：未跟进；1：跟进
+     */
+    private Short follow;
 
     public String getName() {
         return name;
@@ -272,4 +288,36 @@ public class CompanyAudit {
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getFollow() {
+        return follow;
+    }
+
+    public void setFollow(Short follow) {
+        this.follow = follow;
+    }
+
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCountCode() {
+        return countCode;
+    }
+
+    public void setCountCode(String countCode) {
+        this.countCode = countCode;
+    }
 }
diff --git a/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java b/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java
index 3e2dc08..7a297a1 100644
--- a/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java
+++ b/user-service/src/main/java/com/hp/user/service/entity/CustomerCompany.java
@@ -97,10 +97,14 @@ public class CustomerCompany implements Serializable {
      * 更新用户Id
      */
     private String sysUpdater;
+    /**
+     * 审核状态；1待审核；2审核通过；3审核未通过
+     */
+    private Short status;
 
     public CustomerCompany(){}
 
-    public CustomerCompany(String customerId, String name, Short type, Short industryCode, String longitude, String latitude, String address, String provinceCode, String cityCode, String countCode, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Short sysDeleted, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater) {
+    public CustomerCompany(String customerId, String name, Short type, Short industryCode, String longitude, String latitude, String address, String provinceCode, String cityCode, String countCode, String enterpriseTaxNumber, String businessLicense, String businessContact, String phoneNumber, Short sysDeleted, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short status) {
         this.customerId = customerId;
         this.name = name;
         this.type = type;
@@ -120,6 +124,7 @@ public class CustomerCompany implements Serializable {
         this.sysCreator = sysCreator;
         this.sysUpdateTime = sysUpdateTime;
         this.sysUpdater = sysUpdater;
+        this.status = status;
     }
 
     public String getCustomerId() {
@@ -273,4 +278,12 @@ public class CustomerCompany implements Serializable {
     public void setSysUpdater(String sysUpdater) {
         this.sysUpdater = sysUpdater;
     }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
 }
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 7a6e20d..5170cff 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
@@ -45,9 +45,14 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
 
     @Override
     public boolean delete(String companyId) {
-        // 将deleted字段设置为1
-        CustomerCompany temp = customerCompanyMapper.selectById(companyId);
-        temp.setSysDeleted((short) 1);
+        CustomerCompany temp = new CustomerCompany();
+        try {
+            // 将deleted字段设置为1
+            temp = customerCompanyMapper.selectById(companyId);
+            temp.setSysDeleted((short) 1);
+        } catch (Exception e) {
+
+        }
         // 判断数据库操作是否成功
         return SqlHelper.retBool(customerCompanyMapper.updateById(temp));
     }
@@ -73,13 +78,14 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
     }
 
     @Override
-    public CompanyPage getCompanysPage(Long current, Integer size) {
+    public CompanyPage getCompanysPage(Long current, Integer size, Integer type) {
         CompanyPage companyPage = new CompanyPage();
         List<CustomerCompanyVO> companyVOs = new ArrayList<>();
         IPage<CustomerCompany> page = new Page<>(current, size);
         QueryWrapper<CustomerCompany> queryWrapper = new QueryWrapper<>();
         queryWrapper.orderByDesc("sys_create_time");
         queryWrapper.eq("sys_deleted", 0);
+        queryWrapper.eq("type", type);
         customerCompanyMapper.selectPage(page, queryWrapper);
         List<CustomerCompany> companys = page.getRecords();
         CustomerCompanyVO temp;
@@ -95,6 +101,33 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
         return companyPage;
     }
 
+    @Override
+    public CompanyPage queryServiceProvidersByName(String name, Long current, Integer size) {
+        CompanyPage companyPage = new CompanyPage();
+        List<CustomerCompanyVO> companyVOs = new ArrayList<>();
+        IPage<CustomerCompany> page = new Page<>(current, size);
+        QueryWrapper<CustomerCompany> wrapper = new QueryWrapper<>();
+        wrapper.orderByDesc("sys_create_time");
+        wrapper.eq("sys_deleted", 0);
+        wrapper.eq("type", 0);
+        if (name != null) {
+            wrapper.like("name", name);
+        }
+        customerCompanyMapper.selectPage(page, wrapper);
+        List<CustomerCompany> companys = page.getRecords();
+        CustomerCompanyVO temp;
+        for (CustomerCompany company : companys) {
+            temp = new CustomerCompanyVO();
+            BeanUtils.copyProperties(company, temp);
+            companyVOs.add(temp);
+        }
+        companyPage.setCompanyList(companyVOs);
+        companyPage.setTotal(page.getTotal());
+        companyPage.setCurrent(current);
+        companyPage.setSize(size);
+        return companyPage;
+    }
+
     @Override
     public CompanyPage queryCompanysPageByNameAndServiceAndStatus(String name, String serviceProviderName, Integer status, Long current, Integer size) {
         CompanyPage companyPage = new CompanyPage();
@@ -125,6 +158,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
         }
         wrapper.orderByDesc("sys_create_time");
         wrapper.eq("sys_deleted", 0);
+        wrapper.eq("type", 1);
         customerCompanyMapper.selectPage(page, wrapper);
         List<CustomerCompany> companys = page.getRecords();
         CustomerCompanyVO t;
@@ -164,7 +198,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
     public CompanyAuditPage queryCompanysPageByNameAndStatusAndCreateTime(String name, Integer status, Date startTime, Date endTime, Long current, Integer size) {
         CompanyAuditPage companyAuditPage = new CompanyAuditPage();
         Page<CompanyAudit> page = new Page<>(current, size);
-        List<CompanyAudit> companyAudits = customerCompanyMapper.queryCompanyAuditPageByNameAndStatusAndCreateTime(page,name,status,startTime,endTime);
+        List<CompanyAudit> companyAudits = customerCompanyMapper.queryCompanyAuditPageByNameAndStatusAndCreateTime(page, name, status, startTime, endTime);
 
         List<CompanyAuditVO> companyAuditVOList = new ArrayList<>();
         CompanyAuditVO temp;
diff --git a/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml b/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml
index 284f97a..c1e6e3f 100644
--- a/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml
+++ b/user-service/src/main/resources/mapper/CustomerCompanyMapper.xml
@@ -3,18 +3,12 @@
 <mapper namespace="com.hp.user.service.dao.CustomerCompanyMapper">
 
     <select id="selectCompanyAuditPage" resultType="com.hp.user.service.entity.CompanyAudit">
-        --- 总是只显示最新的审核记录
---         select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,e.* from tb_customer_company as a,
---         (select b.* from tb_customer_audit as b,
---             (select c.user_id,max(c.sys_create_time) sys_create_time from tb_customer_audit as c GROUP BY c.user_id) as d
---                 where b.user_id = d.user_id and b.sys_create_time = d.sys_create_time) as e
---         where a.customer_id = e.user_id and a.sys_deleted=0 ORDER BY a.sys_create_time DESC
-        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,b.* from tb_customer_company as a,tb_customer_audit as b
-        where a.customer_id = b.user_id and a.sys_deleted = 0 ORDER BY a.name,b.sys_create_time DESC
+        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.* from tb_customer_company as a,tb_customer_audit as b
+        where a.customer_id = b.user_id and a.sys_deleted = 0 and a.type = 1 ORDER BY a.name,b.sys_create_time DESC
     </select>
     <select id="queryCompanyAuditPageByNameAndStatusAndCreateTime" resultType="com.hp.user.service.entity.CompanyAudit">
-        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,b.* from tb_customer_company as a,tb_customer_audit as b
-        where a.customer_id = b.user_id and a.sys_deleted = 0
+        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.* from tb_customer_company as a,tb_customer_audit as b
+        where a.customer_id = b.user_id and a.sys_deleted = 0 and a.type = 1
         <if test="name != null"> and a.name = #{name} </if>
         <if test="status != 0"> and b.status = #{status} </if>
         <if test="startTime != null"> and b.sys_create_time  &gt;= #{startTime} </if>