From fbb120dee0d2501210c4395715a6c030f340004e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 十月 2025 09:11:52 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
index 53d159c..b35f66e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
@@ -247,7 +247,19 @@
.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()){
--
Gitblit v1.7.1