Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java =================================================================== diff -u -r27699 -r27701 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 27699) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 27701) @@ -148,7 +148,6 @@ .getOrgUnitCodingFromSupplyRoomConfig(); boolean enableUrgentFunction = CssdUtils.getSystemSetConfigByNameBool("enableUrgentFunction", false); String joinSqlOfUrgent = ""; - String orderSqlOfUrgent = ""; if(enableUrgentFunction){ joinSqlOfUrgent = " left join UrgentLevel ul on p.urgentLevel_id=ul.id "; } @@ -158,9 +157,6 @@ } if (dbConnection.isSqlServer()) { - if(enableUrgentFunction){ - orderSqlOfUrgent = " ul.grade desc,"; - } String tempSql = "(SELECT TOP " + end + " r.*,p.type,p.remark,p.submitTime,p.recyclingStatus "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() @@ -169,7 +165,7 @@ + orgUnitCodingFromSupplyRoomConfig + "' and " + filterSql - + " order by " + orderSqlOfUrgent +recyclingAmountNeedConfirmOrder+" r.recyclingTime desc) A"; + + " order by " +recyclingAmountNeedConfirmOrder+" r.recyclingTime desc) A"; String tempSql2 = "(SELECT TOP " + (start - 1) + " r.id FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() @@ -182,16 +178,13 @@ + tempSql2 + " order by A.recyclingTime desc "; } else if (dbConnection.isOracle()) { - if(enableUrgentFunction){ - orderSqlOfUrgent = " nvl(ul.grade,0) desc,"; - } sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type,p.remark,p.submitTime,p.recyclingStatus "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() + " p on r.recyclingApplication_id = p.id " + joinSqlOfUrgent + "where r.orgUnitCoding = '" + orgUnitCodingFromSupplyRoomConfig + "' and " + filterSql - + " order by "+orderSqlOfUrgent + recyclingAmountNeedConfirmOrder+" r.recyclingTime desc) A WHERE ROWNUM <= " + + " order by " + recyclingAmountNeedConfirmOrder+" r.recyclingTime desc) A WHERE ROWNUM <= " + end + ")WHERE RN >= " + start; }