From 3ee6936275a3f5d0e06c778d30ff2c3c1c16c205 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 7 Mar 2025 16:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E5=8D=A1=E5=8A=9E=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/jysoft/card/service/NewCardService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java index 4df33fc..638aa3a 100644 --- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java +++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java @@ -368,7 +368,7 @@ public class NewCardService { public void pushInfo(CardVo vo) { String title = "" + vo.getCardType() + "申请"; String text = "您好，您有新的" + vo.getCardType() + "申请需要审批，请点击查看。"; - String url = "/pages/access-card/card-record?currentTabIndex=1"; + String url = "/pages/access-card/card-record?currentTabIndex=0"; aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url); } @@ -1207,7 +1207,7 @@ public class NewCardService { public void pushInfo2(CardVo vo) { String title = "" + vo.getCardType() + "审批通过"; String text = "您好，" + vo.getCardType() + "申请审批已通过，请点击查看。"; - String url = "/pages/access-card/card-record"; + String url = "/pages/access-card/card-record?currentTabIndex=1"; aliasManageController.pushToSingle(vo.getCheckUserId(), title, text, url); } @@ -1250,7 +1250,7 @@ public class NewCardService { + " FROM GREEN_CARD gc " + " WHERE (gc.EXAMINE_BATCH = '1' AND gc.EXAMINE_STATE = '0' AND gc.EXAMINE_PERSON_ID = ?) OR" + " (gc.EXAMINE_BATCH != '1' AND gc.OPER_TYPE = '2' AND gc.EXAMINE_STATE = '0' AND gc.OPER_CARD_ID = ?) OR" - + " (gc.EXAMINE_BATCH != '1' AND gc.OPER_TYPE IN ('0','1') AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE IN ("+handlePlaceholder(aduitRoles)+")) OR" + + " (gc.EXAMINE_BATCH != '1' AND gc.OPER_TYPE IN ('0','1') AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE IN ("+handlePlaceholder(aduitRoles)+"))" + " GROUP BY gc.DATA_ID" + ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE num > ?"; System.err.println(sql);