| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -116,10 +116,13 @@ public class SupManufacturerController {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					//        return ResultVOUtils.success(pageSimpleResponse);
 | 
					 | 
					 | 
					 | 
					//        return ResultVOUtils.success(pageSimpleResponse);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					//    }
 | 
					 | 
					 | 
					 | 
					//    }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    @AuthRuleAnnotation("")
 | 
					 | 
					 | 
					 | 
					    @AuthRuleAnnotation("")
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    @GetMapping("/directToCpt/sup/manufacturer/getCompanyBySup")
 | 
					 | 
					 | 
					 | 
					    @GetMapping("/directToCpt/sup/manufacturer/getCompanyBySup")
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) {
 | 
					 | 
					 | 
					 | 
					    public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					//        filterSupManufacturerRequest.setCustomerId(getCustomerId());
 | 
					 | 
					 | 
					 | 
					        filterSupManufacturerRequest.setCustomerId(getCompanyId());
 | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        System.out.println("111111111111111111111111111111111111:"+getCompanyId());
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
 | 
					 | 
					 | 
					 | 
					        List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        PageInfo<SupManufacturerEntity> pageInfo = new PageInfo<>(companyEntities);
 | 
					 | 
					 | 
					 | 
					        PageInfo<SupManufacturerEntity> pageInfo = new PageInfo<>(companyEntities);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        PageSimpleResponse<SupManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
 | 
					 | 
					 | 
					 | 
					        PageSimpleResponse<SupManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -650,4 +653,14 @@ public class SupManufacturerController {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
 | 
					 | 
					 | 
					 | 
					        AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        return authAdmin.getCustomerId() + "";
 | 
					 | 
					 | 
					 | 
					        return authAdmin.getCustomerId() + "";
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    }
 | 
					 | 
					 | 
					 | 
					    }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					    public String getCompanyId() {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        if (attributes == null) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					            throw new JsonException(ResultEnum.NOT_NETWORK);
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        HttpServletRequest request = attributes.getRequest();
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        String companyId = request.getHeader("companyId");
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        return companyId;
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					    }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					}
 | 
					 | 
					 | 
					 | 
					}
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
					 | 
					 | 
					
 
 |