Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java =================================================================== diff -u -r35719 -r35745 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 35719) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 35745) @@ -479,27 +479,11 @@ if(CollectionUtils.isEmpty(tiList)){ return sterilizationIdMap; } - List tousseInstanceIdList = new ArrayList(); for(TousseInstance ti : tiList){ - tousseInstanceIdList.add(ti.getId()); - } - String sql = String.format("select ti.id, case when ti.sterilizationRecord_id is not null then ti.sterilizationRecord_id else sti.sterilizationRecord_id end sterilizationRecordId " - + "from %s ti " - + "left join sterilization_tousseInstance sti on sti.tousseInstance_id = ti.id where %s", - TousseInstance.class.getSimpleName(), - SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.id", tousseInstanceIdList)); - ResultSet rs = null; - try { - rs = objectDao.executeSql(sql); - while(rs.next()){ - Long id = rs.getLong("id"); - Long sterilizationRecordId = rs.getLong("sterilizationRecordId"); - sterilizationIdMap.put(id, sterilizationRecordId); + Long sterilizationRecordId = ti.getSterilizationRecord_id(); + if(DatabaseUtil.isPoIdValid(sterilizationRecordId)){ + sterilizationIdMap.put(ti.getId(), sterilizationRecordId); } - } catch (Exception e) { - e.printStackTrace(); - } finally { - DatabaseUtil.closeResultSetAndStatement(rs); } return sterilizationIdMap; } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java =================================================================== diff -u -r35719 -r35745 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 35719) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/dwr/table/ForeignTousseApplicationTableManager.java (.../ForeignTousseApplicationTableManager.java) (revision 35745) @@ -182,10 +182,9 @@ Map> foreignTousseAppTousseIdPackingAmountMap = new HashMap>(); String sql = String.format("select ti.foreignTousseApp_id, ti.id tousseInstanceID" + ", case when td.parentID is not null then td.parentID else td.id end tdParentId" - + ", case when ti.sterilizationRecord_id is not null then ti.sterilizationRecord_id else sti.sterilizationRecord_id end sterilizationRecordId " + + ", ti.sterilizationRecord_id sterilizationRecordId " + "from %s ti " - + "join %s td on td.id = ti.tousseDefinition_id " - + "left join sterilization_tousseInstance sti on sti.tousseInstance_id = ti.id where %s ", + + "join %s td on td.id = ti.tousseDefinition_id where %s ", TousseInstance.class.getSimpleName(), TousseDefinition.class.getSimpleName(), SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.foreignTousseApp_id", foreignTousseApplicationIdList));