mitao
2 天以前 5b13db7e2c95385d69b8bdb449560bbbfe359146
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
@@ -241,12 +241,25 @@
        if (StringUtils.hasLength(query.getNameOrCode())){
            // 查询出资产名称或者资产编号符合条件的code
            List<Integer> assetMainIds = assetMainService.lambdaQuery()
                    .eq(AssetMain::getAssetTypeId,8)
                    .and(wrapper -> wrapper.like(AssetMain::getAssetName, query.getNameOrCode())
                            .or()
                            .like(AssetMain::getAssetCode, query.getNameOrCode()))
                    .list()
                    .stream()
                    .map(AssetMain::getAssetTypeId)
                    .map(AssetMain::getId)
                    .collect(Collectors.toList());
            query.setAssetMainIds(assetMainIds);
            if (assetMainIds.isEmpty()){
                res.setPageList(new PageInfo<>());
                return R.ok(res);
            }
        }else{
            List<Integer> assetMainIds = assetMainService.lambdaQuery()
                    .eq(AssetMain::getAssetTypeId,8)
                    .list()
                    .stream()
                    .map(AssetMain::getId)
                    .collect(Collectors.toList());
            query.setAssetMainIds(assetMainIds);
            if (assetMainIds.isEmpty()){