Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r40747 -r40750 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40747) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 40750) @@ -8059,6 +8059,12 @@ if(CollectionUtils.isEmpty(tousseDefinitionIds)){ return cleanTypes; } + Set ancestorIDs = objectDao.getLongSet("select ancestorID from " + + TousseDefinition.class.getSimpleName() + " where 1=1 " + + SqlUtils.getInLongListSql("id",tousseDefinitionIds)); + if(CollectionUtils.isEmpty(ancestorIDs)){ + return cleanTypes; + } String sql = "select cm.cleanType cleanType1 ,cmm.cleanType cleanType2 from " + TousseDefinition.class.getSimpleName() + " td left join "+ CleanMethod.class.getSimpleName() @@ -8069,7 +8075,7 @@ + CleanMethod.class.getSimpleName() +" cmm on cmm.id=tc.cleanMethodId " + " where 1=1 " - + SqlUtils.getInLongListSql("td.id",tousseDefinitionIds); + + SqlUtils.getInLongListSql("td.id",ancestorIDs); ResultSet rs = null; try { rs = objectDao.executeSql(sql);