From 3f7f39de434c74d965e3a27c59f7f197b5ff59e6 Mon Sep 17 00:00:00 2001
From: masong <ms@cjy.com>
Date: Tue, 7 May 2024 14:00:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../traceability/controller/admin/block/BlockController.java    | 2 +-
 .../module/traceability/dal/mysql/block/BlockMapper.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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<Boolean> 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<BlockDO> {
 
     @Select(value={
             "<script>select ifnull(sum(block_area),0) from traceability_block where deleted is false and  base_id =#{baseId}" +
-             " <if test=\"blockId !=null\"> where id  !=#{blockId} </if>"+
+             " <if test=\"blockId !=null\"> and id  !=#{blockId} </if>"+
             "</script>"})
     public BigDecimal selectSumBlockArea(@Param("baseId") Long baseId,@Param("blockId") Long blockId);
 }
\ No newline at end of file