From 99c4879ab008e5c77b926646f1e1f9b82b20c983 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Wed, 23 Apr 2025 18:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=AE=A1=E6=A0=B8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nationalelectric/greenH5/GreenHouseController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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> list = hibernateDao.queryForListWithSql(sql, new Object[] { houseType, limit, pageSize }); for (Map map1 : list) {