From b1223724f13734b83c0447979eafcb586c1d23e3 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Mon, 8 Sep 2025 09:44:51 +0800
Subject: [PATCH] =?UTF-8?q?null=20=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/resource/TResourceLandController.java     | 5 +++--
 .../controller/resource/TResourceOperationController.java    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java
index 2be7f0a..ef491d1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java
@@ -126,8 +126,9 @@ public class TResourceLandController extends BaseController
         TResourceVo resource = new TResourceVo();
 
         TResourceLand land = tResourceLandService.selectTResourceLandByDkbm(dkbm);
-
-        BeanUtils.copyProperties(land, resource);
+        if(StringUtils.isNotNull(land)){
+            BeanUtils.copyProperties(land, resource);
+        }
 
         TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm);
         if(StringUtils.isNotNull(operation)){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
index 5413762..026b5b7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java
@@ -127,8 +127,9 @@ public class TResourceOperationController extends BaseController
         TResourceVo resource = new TResourceVo();
 
         TResourceLand land = tResourceLandService.selectTResourceLandByDkbm(dkbm);
-
-        BeanUtils.copyProperties(land, resource);
+        if(StringUtils.isNotNull(land)){
+            BeanUtils.copyProperties(land, resource);
+        }
 
         TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm);