diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java
index 70e0eac0..3a6ef03f 100644
--- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java
+++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java
@@ -183,7 +183,7 @@ public List<BlockGroup> getBlockGroupByIdsOrAppId(List<Integer> ids, Integer app
             blockGroupsListResult = blockGroupMapper.queryAllBlockGroupAndBlock( blockCreatedBy, groupCreatedBy);
         }
 
-        if (blockGroupsListResult.isEmpty()) {
+        if (blockGroupsListResult.isEmpty() || blockGroupsListResult.get(0).getId() == null) {
             return blockGroupsListResult;
         }
         // 对查询的结果的区块赋值current_version
diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java
index 148cc733..b8841974 100644
--- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java
+++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java
@@ -556,7 +556,6 @@ public Result<BlockDto> deploy(BlockBuildDto blockBuildDto) {
             blockParam.setLatestVersion(blockHistory.getVersion());
             blockParam.setId(blockDto.getId());
             blockParam.setGroups(null);
-
             return updateBlockById(blockParam, blockDto.getAppId());
         } catch (Exception e) {
             return Result.failed(ExceptionEnum.CM001);
diff --git a/base/src/main/resources/mappers/BlockGroupMapper.xml b/base/src/main/resources/mappers/BlockGroupMapper.xml
index 52a37804..9cca31c0 100644
--- a/base/src/main/resources/mappers/BlockGroupMapper.xml
+++ b/base/src/main/resources/mappers/BlockGroupMapper.xml
@@ -183,12 +183,14 @@
         r_block_group_block rbg ON rbg.block_group_id = bg.id
         LEFT JOIN
         t_block b ON b.id = rbg.block_id
-        <if test="blockCreatedBy != null">
-            AND b.created_by = #{blockCreatedBy}
-        </if>
-        <if test="blockCreatedBy == null">
-            AND b.last_build_info is not null and b.content is not null and b.assets is not null
-        </if>
+        <choose>
+            <when test="blockCreatedBy != null">
+                AND b.created_by = #{blockCreatedBy}
+            </when>
+            <otherwise>
+                AND b.last_build_info is not null and b.content is not null
+            </otherwise>
+        </choose>
         <where>
             <if test="groupCreatedBy != null">
                 AND bg.created_by = #{groupCreatedBy}
@@ -246,12 +248,14 @@
         r_block_group_block rbg ON rbg.block_group_id = bg.id
         LEFT JOIN
         t_block b ON b.id = rbg.block_id
-        <if test="blockCreatedBy != null">
-            AND b.created_by = #{blockCreatedBy}
-        </if>
-        <if test="blockCreatedBy == null">
-            AND b.last_build_info is not null and b.content is not null and b.assets is not null
-        </if>
+        <choose>
+            <when test="blockCreatedBy != null">
+                AND b.created_by = #{blockCreatedBy}
+            </when>
+            <otherwise>
+                AND b.last_build_info is not null and b.content is not null
+            </otherwise>
+        </choose>
         <where>
             <if test="appId != null">
                 AND bg.app_id = #{appId}
@@ -311,12 +315,14 @@
         r_block_group_block rbg ON rbg.block_group_id = bg.id
         LEFT JOIN
         t_block b ON b.id = rbg.block_id
-        <if test="blockCreatedBy != null">
-            AND b.created_by = #{blockCreatedBy}
-        </if>
-        <if test="blockCreatedBy == null">
-            AND b.last_build_info is not null and b.content is not null and b.assets is not null
-        </if>
+        <choose>
+            <when test="blockCreatedBy != null">
+                AND b.created_by = #{blockCreatedBy}
+            </when>
+            <otherwise>
+                AND b.last_build_info is not null and b.content is not null
+            </otherwise>
+        </choose>
         <where>
             <if test="id != null">
                 AND bg.id = #{id}
@@ -327,6 +333,7 @@
         </where>
     </select>
 
+
     <!-- 根据条件查询表t_block_group数据 -->
     <select id="queryBlockGroupByCondition" resultMap="BlockGroupMap">
         SELECT