Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java =================================================================== diff -u -r29606 -r29898 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 29606) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 29898) @@ -1702,7 +1702,7 @@ .format("select d.price as price,d.fluctuationPrice as fluctuationPrice, sum(%s(d.amount,0)) as sumAmount, sum(%s(d.returnedAmount,0)+%s(d.useAmount,0)) as sumReturnedAmount from invoice i inner join DiposableGoodsItem d" + " on i.id = d.invoice_id inner join DisposableGoods dg on d.disposableGoodsID=dg.id where d.disposableGoodsBatchStockID=%s and %s(d.amount,0)>(%s(d.returnedAmount,0)+%s(d.useAmount,0)) and d.identificationID is not null ", isNullFunction,isNullFunction, isNullFunction,disposableGoodsBatchStockID,isNullFunction,isNullFunction,isNullFunction)); - sql.append(" and i.settleAccountsDepart = '" + depart + "'");// 限定部门 + sql.append(" and i.depart = '" + depart + "'");// 限定部门 sql.append(" group by d.price, d.fluctuationPrice"); ResultSet resultSet = objectDao.executeSql(sql.toString()); try {