Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-business-service/src/main/resources/application-prod.yml

@@ -47,8 +47,6 @@ spring:
 
 #aliyun OSS服务配置信息，加载到SystemConfiguration
 aliyun:
-  # 外网地址 oss-cn-hangzhou-internal.aliyuncs.com
-  # Bucket 域名 ty-oss-file.oss-cn-hangzhou-internal.aliyuncs.com 可以使用https://ty-oss-file.oss-cn-hangzhou-internal.aliyuncs.com
   oss:
 #    endpoint: http://oss-cn-hangzhou.aliyuncs.com
     #使用内网需要把返回的路径 -internal去掉，不然外网无法访问

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -216,6 +216,8 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                 //如果省份信息
                 .eq(StringUtils.isNotBlank(maintenanceCompanyRequest.getProvinceCode()), "province_code",
                         maintenanceCompanyRequest.getProvinceCode())
+                .like(StringUtils.isNotBlank(maintenanceCompanyRequest.getCompanyName()), "name",
+                        maintenanceCompanyRequest.getCompanyName())
                 .eq(maintenanceCompanyRequest.getVipFlag() != null, "vip_flag",
                         maintenanceCompanyRequest.getVipFlag())
                 .eq("is_certificated", ApiConstants.CompanyConstants.MAINTENANCE_PASS)