Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r23905 -r23912 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 23905) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 23912) @@ -1343,11 +1343,17 @@ List borrowRecyclingApplicationIds = returnGoodsVo.getNewBorrowingRecyclingApplicationIds(); if(CollectionUtils.isNotEmpty(borrowRecyclingApplicationIds)){ List borrowRecyclingApplications = recyclingApplicationManager.getCollectionForUpdate(borrowRecyclingApplicationIds); + boolean showSettleAccountsDepartInRecycling = CssdUtils.getSystemSetConfigByNameBool("showSettleAccountsDepartInRecycling"); for(RecyclingApplication recyclingApplication : borrowRecyclingApplications){ RecyclingRecord newRecord = new RecyclingRecord(); newRecord.setApplySubmintDateTime(recyclingApplication.getSubmitTime()); - newRecord.setDepart(record.getDepart()); - newRecord.setDepartCode(record.getDepartCode()); + if(showSettleAccountsDepartInRecycling){ + newRecord.setDepart(recyclingApplication.getSettleAccountsDepart()); + newRecord.setDepartCode(recyclingApplication.getSettleAccountsDepartCoding()); + }else{ + newRecord.setDepart(recyclingApplication.getDepart()); + newRecord.setDepartCode(recyclingApplication.getDepartCoding()); + } newRecord.setOperator(record.getOperator()); newRecord.setOrgUnitCoding(record.getOrgUnitCoding()); newRecord.setRecyclingApplication(recyclingApplication);