diff --git a/greenH5modul/src/com/nationalelectric/greenH5/GreenHouseController.java b/greenH5modul/src/com/nationalelectric/greenH5/GreenHouseController.java
index 5d9286c..f12ffd9 100644
--- a/greenH5modul/src/com/nationalelectric/greenH5/GreenHouseController.java
+++ b/greenH5modul/src/com/nationalelectric/greenH5/GreenHouseController.java
@@ -1768,9 +1768,12 @@ public class GreenHouseController extends GreenBaseController {
 					+ "H.AMOUNT,H.AIR, P.PIC from  GREEN_HOUSE H LEFT JOIN ( "
 					+ "SELECT HOUSE_ID, LISTAGG (to_char(PICTURE), ',') WITHIN GROUP (ORDER BY SORT) AS PIC "
 					+ "FROM GREEN_HOUSE_PICTURE GROUP BY HOUSE_ID ) P ON H.UUID = P.HOUSE_ID WHERE H.IS_DELETED='N' "
-					+ "AND HOUSE_TYPE = ? AND STATUS = 1 and H.HOUSE_NAME like '%"+keyWord+"%' "
-					+ "order by H.GMT_CREATED DESC  )rn ) WHERE rw > ? AND rw <= ? ";
-
+					+ "AND HOUSE_TYPE = ? AND STATUS = 1 ";
+					if(keyWord !=null && !"".equals(keyWord) && !"null".equals(keyWord)){
+						sql = sql+ " and H.HOUSE_NAME like '%"+keyWord+"%' ";
+					}
+					sql = sql + " order by H.GMT_CREATED DESC  )rn ) WHERE rw > ? AND rw <= ? ";
+			System.err.println("getFreeHouse sql="+sql);
 			List<Map<String, Object>> list = hibernateDao.queryForListWithSql(sql,
 					new Object[] { houseType, limit, pageSize });
 			for (Map<String, Object> map1 : list) {