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