fix: Fix block update bug

Author: lu-yg

base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java

@@ -94,8 +94,16 @@ public interface BlockGroupBlockMapper extends BaseMapper<BlockGroupBlock> {
      * 通过区块分组id和区块删除区块与分组关联关系
      * @param blockId the block id
      * @param groupId the block group id
-     * @return the list
+     * @return the Integer
      */
     @Delete("delete from r_block_group_block where block_group_id = #{groupId} and block_id = #{blockId}")
     Integer deleteByGroupIdAndBlockId(Integer groupId, Integer blockId);
+
+    /**
+     * 通过区块id删除区块与分组关联关系
+     * @param blockId the block id
+     * @return the Integer
+     */
+    @Delete("delete from r_block_group_block where block_id = #{blockId}")
+    Integer deleteByBlockId(Integer blockId);
 }

base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java

@@ -153,7 +153,8 @@ public List<Block> queryBlockByCondition(Block block) {
      */
     @Override
     public Integer deleteBlockById(Integer id) {
-        return baseMapper.deleteBlockById(id);
+        baseMapper.deleteBlockById(id);
+        return blockGroupBlockMapper.deleteByBlockId(id);
     }
 
     /**
@@ -171,7 +172,7 @@ public Result<BlockDto> updateBlockById(BlockParam blockParam) {
         if (blockResult == null) {
             return Result.failed(ExceptionEnum.CM001);
         }
-        if (!Objects.equals(blockResult.getAppId(), blockParam.getAppId())) {
+        if (!Objects.equals(blockResult.getOccupierBy(), loginUserContext.getLoginUserId())) {
             return Result.failed(ExceptionEnum.CM007);
         }
         // 把前端传参赋值给实体

base/src/test/java/com/tinyengine/it/service/material/impl/BlockServiceImplTest.java

@@ -27,6 +27,7 @@
 import com.tinyengine.it.common.base.Result;
 import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.mapper.AppMapper;
+import com.tinyengine.it.mapper.BlockGroupBlockMapper;
 import com.tinyengine.it.mapper.BlockGroupMapper;
 import com.tinyengine.it.mapper.BlockMapper;
 import com.tinyengine.it.mapper.UserMapper;
@@ -69,6 +70,9 @@ class BlockServiceImplTest {
     @Mock
     private LoginUserContext loginUserContext;
 
+    @Mock
+    private BlockGroupBlockMapper blockGroupBlockMapper;
+
     @InjectMocks
     private BlockServiceImpl blockServiceImpl;
 
@@ -110,6 +114,7 @@ void testQueryBlockByCondition() {
     @Test
     void testDeleteBlockById() {
         when(blockMapper.deleteBlockById(123)).thenReturn(1);
+        when(blockGroupBlockMapper.deleteByBlockId(123)).thenReturn(1);
 
         Integer result = blockServiceImpl.deleteBlockById(123);
         Assertions.assertEquals(1, result);