Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r27939 -r28084
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 27939)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 28084)
@@ -119,7 +119,9 @@
 				vo.setHighLight(true);
 			}
 		}*/
-		setSentState(invoicePlans , request);
+		if(request != null){
+			setSentState(invoicePlans , request);
+		}
 		return invoicePlans;
 	}
 
@@ -1017,7 +1019,7 @@
 					+ "join %s "+ invoicePlanTableAlias +" on "+ tousseInstanceTableAlias +".foreignTousseApp_id="+ invoicePlanTableAlias +".id "
 					+ "left join %s ul on "+ tousseInstanceTableAlias +".urgentLevel_id=ul.id "
 					+ "left join %s td on "+ tousseInstanceTableAlias +".tousseDefinition_id=td.id "
-					+ "where %s and %s order by ul.grade desc,"+ invoicePlanTableAlias +".applicationTime", Constants.STR_NO,
+					+ "where %s and %s order by grade desc,applicationTime", Constants.STR_NO,
 					TousseInstance.class.getSimpleName() , InvoicePlan.class.getSimpleName(), UrgentLevel.class.getSimpleName() , 
 					TousseDefinition.class.getSimpleName() ,invoicePlanForeignTousseCondition,tousseInstanceCondition);