| 
					
				 | 
			
			
				@@ -285,7 +285,7 @@ private int i = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void addProductImg(ForestPath forestPath,String companyName,Long companyId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<String> directory = getDirectory(forestPath.getPath()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         Long aLong = companyId(companyName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<PmsProduct> products = selectProduct(aLong); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<PmsProduct> products = selectProduct(companyName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (products != null&&directory != null&& products.size()>0&&directory.size()>0&&products.size()==directory.size()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (int i = 0;i<directory.size();i++){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 updateFile(forestPath.getPath(),products.get(i).getId(),directory.get(i)); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -329,10 +329,13 @@ private int i = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Autowired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private PmsProductMapper pmsProductMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public List<PmsProduct> selectProduct(Long companyId){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public List<PmsProduct> selectProduct(String companyName){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         PmsProductExample pms = new PmsProductExample(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         PmsProductExample.Criteria criteria = pms.createCriteria(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        criteria.andUmsCompanyInfoIdEqualTo(companyId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            criteria.andUmsCompanyInfoEqualTo(companyName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//        criteria.andUmsCompanyInfoIdEqualTo(companyId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pms.setOrderByClause("id asc"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<PmsProduct> pmsProducts = pmsProductMapper.selectByExample(pms); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return pmsProducts; 
			 |