Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r24694 -r24703 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 24694) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 24703) @@ -1977,7 +1977,7 @@ + " join TousseItem ti on ti.recyclingApplication_ID=ip.id " + " join TousseDefinition td on td.id=ti.tousseDefinitionId where 1=1 " + queryCondition + " and (ti.isRecycling = '"+ Constants.STR_NO +"' or ti.recyclingAmount > 0)"; - querySql += " union select rr.depart,ri.tousseName,ri.amount,ri.amount as recyclingAmount,td.taskGroup " + querySql += " union all select rr.depart,ri.tousseName,ri.amount,ri.amount as recyclingAmount,td.taskGroup " + " from RecyclingRecord rr join RecyclingItem ri on rr.id=ri.recyclingRecord_id " + " join TousseDefinition td on td.id=ri.tousseDefinitionId " + " where 1=1 and rr.recyclingApplication_id is null " + queryCondition