Merge remote-tracking branch 'origin/master'

无关风月

23 小时以前 92ff484325b9af3afd081ec079f74fbc6dd3fea8

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetInventoryTaskServiceImpl.java

@@ -459,6 +459,9 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void handleResult(List<AssetInventoryTaskItemDTO> dtoList) {
        if (CollUtil.isEmpty(dtoList)) {
            throw new ServiceException("盘点结果数据不能为空");
        }
        Map<Integer, Integer> taskItemMap = dtoList.stream()
                .collect(Collectors.toMap(AssetInventoryTaskItemDTO::getAssetInventoryTaskItemId, AssetInventoryTaskItemDTO::getDeal));
        List<AssetInventoryTaskItem> assetInventoryTaskItems = assetInventoryTaskItemService.listByIds(taskItemMap.keySet());