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());