diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java index a05667c..797b67a 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java @@ -71,7 +71,7 @@ public class BlockController { @PreAuthorize("@ss.hasPermission('traceability:block:update')") public CommonResult updateBlock(@Valid @RequestBody BlockSaveReqVO updateReqVO) { TraceabilityBaseDO traceabilityBaseDO = baseService.selectById(updateReqVO.getBaseId().longValue()); - BigDecimal useBaseArea =blockService.selectSumBlockArea(updateReqVO.getBaseId().longValue(),null); + BigDecimal useBaseArea =blockService.selectSumBlockArea(updateReqVO.getBaseId().longValue(),updateReqVO.getId().longValue()); BigDecimal allBaseArea = updateReqVO.getBlockArea().add(useBaseArea); if(traceabilityBaseDO.getBaseArea().compareTo(allBaseArea) ==-1){ return error(500,"该地块超出基地面积!"); diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java index a09ab16..8bdd346 100644 --- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java +++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java @@ -66,7 +66,7 @@ public interface BlockMapper extends BaseMapperX { @Select(value={ ""}) public BigDecimal selectSumBlockArea(@Param("baseId") Long baseId,@Param("blockId") Long blockId); } \ No newline at end of file