调整

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,"该地块超出基地面积!");

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