Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -175,9 +175,11 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             if(StringUtils.isEmpty(collectOrderBizResponse.getFinishUdiCode())){
                 List<IoCollectCodeBackup> ioCollectCodeBackupList = ioCollectCodeBackMapper.selectList(new QueryWrapper<IoCollectCodeBackup>()
                         .eq("billNo",collectOrderBizRequest.getOrderIdFk())
+                        .eq("relId",collectOrderBiz.getId())
                         .groupBy("code")
                 );
-                if(CollUtil.isNotEmpty(ioCollectCodeBackupList)){
+
+                    if(CollUtil.isNotEmpty(ioCollectCodeBackupList)){
                     for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackupList) {
                         collectOrderBizResponse.setFinishUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getFinishUdiCode()) + "," + ioCollectCodeBackup.getCode());
                     }