diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java index a61a14c97..3af0c2f46 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java @@ -654,12 +654,6 @@ public class AftersalesWorkOrderController extends BladeController { if(ObjectUtils.isNull( aftersalesWorkOrder.getOrderCode()) ){ throw new ServiceException("订单自编号未填!"); } -// if(ObjectUtils.isNull( aftersalesWorkOrder.getFirst()) ){ -// throw new ServiceException("一级品类未填!"); -// } -// if(ObjectUtils.isNull( aftersalesWorkOrder.getSecondary()) ){ -// throw new ServiceException("二级品类未填!"); -// } } try { aftersalesWorkOrder.setInitiationIdentification("PC"); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java index bc294dfcb..ab61b8888 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java @@ -33,12 +33,12 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { excludePathPatterns("/factory/auth/token"). excludePathPatterns("/factory/oupai/**"). excludePathPatterns("/factory/zb/**") - .excludePathPatterns("/factory/common/**").order(1); + .excludePathPatterns("/factory/common/**").order(2); InterceptorRegistration registryZbFactory = interceptorRegistry.addInterceptor(new ZbFactoryAccountsInterceptor(zbFactoryProperties)); - registryZbFactory.addPathPatterns("/factory/zb/**").order(2); + registryZbFactory.addPathPatterns("/factory/zb/**").order(3); - registry=interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment)).addPathPatterns("/**").order(3); + registry=interceptorRegistry.addInterceptor(new LocalServerLoginAccountsInterceptor(redis,environment)).addPathPatterns("/**").order(1); } }