From c55edce8ef3f3adf1ff922720d2ef5194d2a2e98 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 7 Mar 2025 14:18:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E5=8D=A1=E5=8A=9E=E8=AF=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jysoft/card/service/NewCardService.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java index bdc70e5..371cbf5 100644 --- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java +++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java @@ -1290,12 +1290,12 @@ public class NewCardService { + " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\"," + " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\"," + " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\"" - + " FROM GREEN_CARD gc " - + " LEFT JOIN GREEN_CARD_EXAMINE gce ON gc.ID = gce.CARD_ID " - + " WHERE (gc.CARD_TYPE IN ('职工卡','第三方人员') AND gce.USER_ID = ? ) OR" - + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH IN ('1','2','3') AND gce.USER_ID = ? ) OR" - + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gce.USER_ID = '0' ) OR" - + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '1' AND gce.USER_ID = ? )" + + " FROM GREEN_CARD_EXAMINE gce " + + " LEFT JOIN GREEN_CARD gc ON gc.ID = gce.CARD_ID " + + " WHERE gce.USER_ID = ?" +// + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH IN ('1','2','3') AND gce.USER_ID = ? ) OR" +// + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gce.USER_ID = '0' ) OR" +// + " (gc.CARD_TYPE IN ('VIP贵宾','临时出入证','施工出入证') AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '1' AND gce.USER_ID = ? )" + " GROUP BY gc.DATA_ID" + ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?"; System.err.println(sql); @@ -1304,8 +1304,6 @@ public class NewCardService { Integer page = (pageNum - 1) * pageSize; Integer limit = pageNum * pageSize; parameter.add(userId); - parameter.add(userId); - parameter.add(userId); parameter.add(limit); parameter.add(page); List> list = iHibernateDao.queryForListWithSql(sql,