打包文件提交

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/CustomCORSConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter;
  * @date 2019-12-10
  * @description
  */
-@Configuration
+//@Configuration
 public class CustomCORSConfiguration {
     private CorsConfiguration buildConfig(){
         CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -26,7 +26,7 @@ public class CustomCORSConfiguration {
     }
 
     // 添加CorsFilter拦截器，对任意的请求使用
-    @Bean
+    //@Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());

lift-system-service/pom.xml

@@ -18,10 +18,10 @@
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>cn.com.xwy</groupId>-->
-<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.com.xwy</groupId>
+            <artifactId>xwy-cloud-dependencies</artifactId>
+        </dependency>
 
         <!-- 添加公共模块依赖 -->
         <dependency>

lift-system-service/src/main/java/cn/com/ty/lift/system/SystemApplication.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 @EnableFeignClients
 @MapperScan("cn.com.ty.**.mapper")
 @SpringBootApplication(scanBasePackages = {"cn.com.ty.lift", "cn.com.xwy.boot"})
-@CrossOrigin
+//@CrossOrigin
 @EnableRedisHttpSession
 @EnableRedisRepositories
 public class SystemApplication {

lift-system-service/src/main/java/cn/com/ty/lift/system/config/CustomCORSConfiguration.java

@@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter;
  * @date 2019-12-10
  * @description
  */
-@Configuration
+//@Configuration
 public class CustomCORSConfiguration {
     private CorsConfiguration buildConfig(){
         CorsConfiguration corsConfiguration = new CorsConfiguration();
@@ -23,7 +23,7 @@ public class CustomCORSConfiguration {
     }
 
     // 添加CorsFilter拦截器，对任意的请求使用
-    @Bean
+    //@Bean
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", buildConfig());

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/MaintenanceCompanyResponse.java

@@ -1,10 +1,13 @@
 package cn.com.ty.lift.system.settings.dao.entity.model;
 
+import lombok.Data;
+
 /**
  * @author huangyuan
  * @date 2019-12-11
  * @description 维保公司相应类
  */
+@Data
 public class MaintenanceCompanyResponse {
     /**
      * 公司id

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

@@ -203,7 +203,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
                 .eq(currentUserId != null, "customer_manager_id", currentUserId)
                 //通过审核状态筛选申请信息
                 .eq("is_certificated", companyAttestationRequest.getIsCertificated())
-                .eq("mt_company_id", companyAttestationRequest.getQueryCompanyId())
+                .eq(companyAttestationRequest.getQueryCompanyId() != null, "mt_company_id", companyAttestationRequest.getQueryCompanyId())
                 .and(StringUtils.isNotBlank(companyAttestationRequest.getQueryCondition()), i -> i
                         .like("contacts_name", companyAttestationRequest.getQueryCondition())
                         .or()
@@ -281,7 +281,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     public RestResponse applyCompanyList(MaintenanceCompanyRequest maintenanceCompanyRequest) {
         List<MaintenanceCompanyResponse> maintenanceCompanyResponseList = mtCompanyAttestationMapper
                 .applyCompanyList(maintenanceCompanyRequest.getIsCertificated());
-        return RestResponse.success(maintenanceCompanyResponseList);
+        return RestResponse.success(maintenanceCompanyResponseList, ApiConstants.RESULT_SUCCESS, "获取成功");
     }
 
     /**

lift-system-service/src/main/resources/application.yml

@@ -14,7 +14,7 @@ spring:
   application:
     name: lift-system-service
   profiles:
-    active: test
+    active: prod
 
 #自动添加createTime、isDelete 等字段
 xwy: