Merge remote-tracking branch 'origin/main'

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java

@@ -1,5 +1,6 @@
 package com.cjy.traceability.module.traceability.controller.admin.block;
 
+import cn.hutool.core.util.StrUtil;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
 import org.aspectj.apache.bcel.generic.RET;
 import org.springframework.web.bind.annotation.*;
@@ -46,6 +47,9 @@ public class BlockController {
     @Operation(summary = "创建地块信息")
     @PreAuthorize("@ss.hasPermission('traceability:block:create')")
     public CommonResult<Integer> createBlock(@Valid @RequestBody BlockSaveReqVO createReqVO) {
+        if( null ==createReqVO.getBaseId()){
+            return error(500,"请选择农场");
+        }
         return success(blockService.createBlock(createReqVO));
     }
 
@@ -105,7 +109,7 @@ public class BlockController {
 
     @GetMapping("/all")
     @Operation(summary = "查询全部地块信息")
-    public CommonResult<List<BlockRespVO>> selectAllBlock(@RequestParam("baseId") Integer baseId){
+    public CommonResult<List<BlockRespVO>> selectAllBlock(@RequestParam(value = "baseId", required = false) Integer baseId){
         List<BlockDO> list = blockService.getBlockList(baseId);
         return success(BeanUtils.toBean(list, BlockRespVO.class));
     }