diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java index 1682621..fc5a730 100644 --- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java +++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java @@ -1295,7 +1295,7 @@ public class NewCardService { + " 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_EXAMINE gce " - + " LEFT JOIN GREEN_CARD gc ON gc.ID = gce.CARD_ID " + + " LEFT JOIN GREEN_CARD gc ON gc.DATA_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"