From e0cc25765a45bf49c1e1952986bd1a8ab0a48f38 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Wed, 21 May 2025 09:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/tc/controller/AssetCurrentController.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
index 2108772..069550b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
@@ -1160,11 +1160,13 @@ public class AssetCurrentController extends BaseController {
         } else {
             assetCurrent.setGlIpList(new ArrayList<>());
         }
-
-        if (!assetCurrent.getXtzt().equals("7")) {
-            assetCurrent.setBtgyy(null);
+        if (assetCurrent.getXtzt() != null) {
+            if (!assetCurrent.getXtzt().equals("7")) {
+                assetCurrent.setBtgyy(null);
+            }
         }
 
+
         assetCurrentService.updateById(assetCurrent);
 
         assetSupplyChainService.deleteByAssetIds(assetCurrent.getId());