null 判断

ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java

@@ -130,19 +130,21 @@ public class TResourceLandController extends BaseController
         BeanUtils.copyProperties(land, resource);
 
         TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm);
+        if(StringUtils.isNotNull(operation)){
+            resource.setId(operation.getId());
+            resource.setJymj(operation.getJymj());
+            resource.setJyfs(operation.getJyfs());
+            resource.setJydxmc(operation.getJydxmc());
+            resource.setJykssj(operation.getJykssj());
+            resource.setJyjssj(operation.getJyjssj());
+            resource.setCbje(operation.getCbje());
+            resource.setBz(operation.getBz());
+            resource.setDkImg(operation.getDkImg());
+            resource.setSurveyStatus(operation.getSurveyStatus());
+
+            TranslateUtils.translate(resource, false);
+        }
 
-        resource.setId(operation.getId());
-        resource.setJymj(operation.getJymj());
-        resource.setJyfs(operation.getJyfs());
-        resource.setJydxmc(operation.getJydxmc());
-        resource.setJykssj(operation.getJykssj());
-        resource.setJyjssj(operation.getJyjssj());
-        resource.setCbje(operation.getCbje());
-        resource.setBz(operation.getBz());
-        resource.setDkImg(operation.getDkImg());
-        resource.setSurveyStatus(operation.getSurveyStatus());
-
-        TranslateUtils.translate(resource, false);
         return success(resource);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.pdf.PdfProperty;
 import com.ruoyi.common.core.domain.pdf.ShoulderItem;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.pdf.PdfUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.translation.TranslateUtils;
@@ -131,18 +132,20 @@ public class TResourceOperationController extends BaseController
 
         TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm);
 
-        resource.setId(operation.getId());
-        resource.setJymj(operation.getJymj());
-        resource.setJyfs(operation.getJyfs());
-        resource.setJydxmc(operation.getJydxmc());
-        resource.setJykssj(operation.getJykssj());
-        resource.setJyjssj(operation.getJyjssj());
-        resource.setCbje(operation.getCbje());
-        resource.setBz(operation.getBz());
-        resource.setDkImg(operation.getDkImg());
-        resource.setSurveyStatus(operation.getSurveyStatus());
-
-        TranslateUtils.translate(resource, false);
+        if(StringUtils.isNotNull(operation)){
+            resource.setId(operation.getId());
+            resource.setJymj(operation.getJymj());
+            resource.setJyfs(operation.getJyfs());
+            resource.setJydxmc(operation.getJydxmc());
+            resource.setJykssj(operation.getJykssj());
+            resource.setJyjssj(operation.getJyjssj());
+            resource.setCbje(operation.getCbje());
+            resource.setBz(operation.getBz());
+            resource.setDkImg(operation.getDkImg());
+            resource.setSurveyStatus(operation.getSurveyStatus());
+
+            TranslateUtils.translate(resource, false);
+        }
         return success(resource);
     }