Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r20399 -r20425 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20399) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 20425) @@ -1823,7 +1823,12 @@ boolean isChange = false; InvoicePlan application = record.getRecyclingApplication(); if (application != null) { - if(!StringUtils.equals(application.getDepartCoding(), record.getDepartCode())){ + boolean showSettleAccountsDepartInRecycling = CssdUtils.getSystemSetConfigByNameBool("showSettleAccountsDepartInRecycling"); + String sourceDepartCode = application.getDepartCoding(); + if(showSettleAccountsDepartInRecycling){ + sourceDepartCode = application.getSettleAccountsDepartCoding(); + } + if(!StringUtils.equals(sourceDepartCode, record.getDepartCode())){ if(InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION.equals(application.getType())){ isChange = true; } else {