From 6365012e69b76d2a7804f5a462745f09a5fa0105 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 11 十月 2025 18:23:02 +0800
Subject: [PATCH] 资产盘点接口

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
index fb4d5ed..957aa9a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AssetTypeServiceImpl.java
@@ -342,7 +342,7 @@
             Integer otherCount= 0;
             BigDecimal totalValue = new BigDecimal("0");
             List<AssetMain> assetMains = assetMainMap.get(asset.getAssetTypeIdSecond());
-            if (!assetMains.isEmpty()){
+            if (assetMains!=null&& !assetMains.isEmpty()){
                 for (AssetMain assetMain : assetMains) {
                     if (assetMain.getAssetStatus().contains("闲置")){
                         idleCount += assetMain.getQuantity();

--
Gitblit v1.7.1