Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r35727 -r35731 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35727) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 35731) @@ -10160,17 +10160,18 @@ return null; } StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("select tdcom.name comTousseName,td.name tdName,td.id from "); + stringBuffer.append("select distinct tdcom.name comTousseName,td.name tdName,td.id from "); stringBuffer.append(ComboTousseComposite.class.getSimpleName()); stringBuffer.append(" c join "); stringBuffer.append(TousseDefinition.class.getSimpleName()); stringBuffer.append(" tdcom on tdcom.id=c.comboTousseDefinitionId join "); stringBuffer.append(TousseDefinition.class.getSimpleName()); stringBuffer.append(" tdc on tdc.id=c.TousseDefinitionId join "); stringBuffer.append(TousseDefinition.class.getSimpleName()); - stringBuffer.append(" td on td.ancestorID=tdc.id where "); + stringBuffer.append(" td on td.ancestorID=tdc.id join "); + stringBuffer.append(PackingTask.class.getSimpleName()); + stringBuffer.append(" pt on pt.tousseDefinition_id=td.id join "+ ComboTousseOrgUint.class.getSimpleName() +" ct on ct.combotoussedefinitionid=c.combotoussedefinitionid where "); stringBuffer.append(SqlUtils.getNonStringFieldInLargeCollectionsPredicate("td.id", tdIds)); - stringBuffer.append(" order by tdcom.id desc"); ResultSet rs = null; Map infoMap = new HashMap(); JSONArray arr = new JSONArray();