Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r28848 -r28885 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 28848) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 28885) @@ -1036,6 +1036,10 @@ String sql = String.format("select src.id, src.orgUnitCoding, ou.name, src.sequence, src.spelling, " + "src.disposablePriceFluctuation, src.showInvoicePlan, src.settleAccountsDepart, src.settleAccountsDepartCoding, ou.status " + "from %s src join %s ou on src.orgUnitCoding = ou.orgUnitCoding where src.supplyRoomType = %d", SupplyRoomConfig.class.getSimpleName(), OrgUnit.class.getSimpleName(), type); + // ZJJSRM-29 科室申领配置排序修改不生效 + if(SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY == type){ + sql += " order by src.sequence "; + } ResultSet rs = null; try { rs = objectDao.executeSql(sql);