Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
===================================================================
diff -u -r13942 -r14487
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 13942)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 14487)
@@ -11,6 +11,8 @@
 
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
+import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.tools.SqlBuilder;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
@@ -137,26 +139,29 @@
 			
 			String tempSql = "(SELECT TOP "
 					+ end
-					+ " r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
+					+ " r.*,p.type,p.remark FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() 
+					+ " p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
 					+ "' and " 
 					+ filterSql
-					+ " order by recyclingTime desc) A";
+					+ " order by r.recyclingTime desc) A";
 			String tempSql2 = "(SELECT TOP "
 					+ (start - 1)
-					+ " r.id FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
+					+ " r.id FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() 
+					+ " p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
 					+ "' and " 
 					+ filterSql
-					+ " order by recyclingTime desc)";
+					+ " order by r.recyclingTime desc)";
 			sql = "SELECT TOP 20 * FROM " + tempSql + " WHERE id not in "
 					+ tempSql2;
 		} else if (dbConnection.isOracle()) {
-			sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
+			sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type,p.remark FROM " + RecyclingRecord.class.getSimpleName() 
+					+ " r left join " + InvoicePlan.class.getSimpleName() + " p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
 					+ "' and " 
 					+ filterSql
-					+ " order by recyclingTime desc) A WHERE ROWNUM <= "
+					+ " order by r.recyclingTime desc) A WHERE ROWNUM <= "
 					+ end
 					+ ")WHERE RN >= " + start;
 		}