取水分检验数据

src/main/java/com/chinaitop/depot/storage/controller/StorageWarterCheckController.java

@@ -211,10 +211,14 @@ public class StorageWarterCheckController {
 		if (null != orgId) {
 			criteria.andOrgIdEqualTo(orgId);
 		}
-		/*
-		 * if (null != storehouse) { criteria.andHouseIdEqualTo(storehouse); } if (null
-		 * != warehouse) { criteria.andWareIdEqualTo(warehouse); }
-		 */
+		
+		  if (null != storehouse)
+		  { criteria.andHouseIdEqualTo(storehouse); 
+		  } 
+		  if (null != warehouse) 
+		  { criteria.andWareIdEqualTo(warehouse); 
+		  }
+		 
 		
 		list = storageWaterCheckService.findWarterData(example);